diff options
| -rw-r--r-- | gdb/.Sanitize | 3 | ||||
| -rw-r--r-- | gdb/ChangeLog | 13 | ||||
| -rw-r--r-- | gdb/Makefile.in | 2 | ||||
| -rw-r--r-- | gdb/config/sun386.mh | 4 | ||||
| -rw-r--r-- | gdb/config/sun386.mt | 2 | ||||
| -rw-r--r-- | gdb/nm-sun386.h | 26 | ||||
| -rw-r--r-- | gdb/sun386-nat.c | 276 | ||||
| -rw-r--r-- | gdb/xm-sun386.h | 11 |
8 files changed, 324 insertions, 13 deletions
diff --git a/gdb/.Sanitize b/gdb/.Sanitize index f2672c8..9703d4f 100644 --- a/gdb/.Sanitize +++ b/gdb/.Sanitize @@ -154,6 +154,7 @@ nm-news.h nm-rs6000.h nm-sun2.h nm-sun3.h +nm-sun386.h nm-sun4os4.h nm-trash.h nm-ultra3.h @@ -205,7 +206,7 @@ stack.c standalone.c stuff.c sun3-nat.c -sun386-xdep.c +sun386-nat.c symfile.c symfile.h symm-tdep.c diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 70f369a..42bd4dd 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,18 @@ Fri Oct 16 13:06:08 1992 K. Richard Pixley (rich@sendai.cygnus.com) + Native support for sun386 (untested). + + * config/sun386.mh (XDEPFILES): removed infptrace.o inftarg.o + fork-child.o sun386-xdep.o. + (NAT_FILE, NATDEPFILES): new macros. + * config/sun386.mt (TDEPFILES): removed exec.o. + * Makefile.in (HFILES): added nm-sun386.h. + * sun386-nat.c, nm-sun386.h: new file. + * sun386-xdep.c: removed. + * xm-sun386.h: updated comment and copyright. + (ATTACH_DETACH, FETCH_INFERIOR_REGISTERS): removed to + nm-sun386.h. + Native support for i386mach (untested). * config/i386mach.mh (XDEPFILES): removed infptrace.o inftarg.o diff --git a/gdb/Makefile.in b/gdb/Makefile.in index f6dbeee..b633d78 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -255,7 +255,7 @@ HFILES= breakpoint.h buildsym.h call-cmds.h command.h defs.h \ xm-m68k.h xm-sparc.h xm-sysv4.h xm-vax.h \ nm-irix3.h nm-irix4.h nm-mips.h nm-rs6000.h nm-sun2.h nm-sun3.h \ nm-sun4os4.h nm-trash.h nm-news.h nm-ultra3.h nm-m88k.h \ - nm-i386mach.h + nm-i386mach.h nm-sun386.h REMOTE_EXAMPLES = m68k-stub.c i386-stub.c sparc-stub.c rem-multi.shar diff --git a/gdb/config/sun386.mh b/gdb/config/sun386.mh index b928499..ee748db 100644 --- a/gdb/config/sun386.mh +++ b/gdb/config/sun386.mh @@ -1,3 +1,5 @@ # Host: Sun 386i -XDEPFILES= infptrace.o inftarg.o fork-child.o sun386-xdep.o +XDEPFILES= XM_FILE= xm-sun386.h +NAT_FILE= nm-sun386.h +NATDEPFILES= exec.o infptrace.o inftarg.o fork-child.o sun386-nat.o diff --git a/gdb/config/sun386.mt b/gdb/config/sun386.mt index 614df41..26bd7c3 100644 --- a/gdb/config/sun386.mt +++ b/gdb/config/sun386.mt @@ -1,3 +1,3 @@ # Target: Sun 386i target configuration file. -TDEPFILES= exec.o i386-pinsn.o solib.o +TDEPFILES= i386-pinsn.o solib.o TM_FILE= tm-sun386.h diff --git a/gdb/nm-sun386.h b/gdb/nm-sun386.h new file mode 100644 index 0000000..1512c6e --- /dev/null +++ b/gdb/nm-sun386.h @@ -0,0 +1,26 @@ +/* Native support for Sun 386i, for GDB, the GNU debugger. + Copyright (C) 1986, 1987, 1989, 1992 Free Software Foundation, Inc. + +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., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +/* Do implement the attach and detach commands. */ + +#define ATTACH_DETACH + +/* Override copies of {fetch,store}_inferior_registers in infptrace.c. */ +#define FETCH_INFERIOR_REGISTERS + diff --git a/gdb/sun386-nat.c b/gdb/sun386-nat.c new file mode 100644 index 0000000..f843eae --- /dev/null +++ b/gdb/sun386-nat.c @@ -0,0 +1,276 @@ +/* Native support for Sun 386i's for GDB, the GNU debugger. + Copyright (C) 1986, 1987, 1989, 1991, 1992 Free Software Foundation, Inc. + Changes for sun386i by Jean Daniel Fekete (jdf@litp.univ-p6-7.fr), + C2V Paris, April 89. + +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., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#if defined (GDB_TARGET_IS_SUN386) + +#include "defs.h" +#include "frame.h" +#include "inferior.h" +#include "gdbcore.h" + +#include <sys/param.h> +#include <sys/dir.h> +#include <sys/user.h> +#include <signal.h> +#include <sys/ioctl.h> +#include <fcntl.h> + +#include <sys/ptrace.h> +#include <machine/reg.h> + +#include <sys/file.h> +#include <sys/stat.h> +#include <sys/core.h> + + +/* Machine-dependent code which would otherwise be in core.c */ +/* Work with core files, for GDB. */ + + +void +core_file_command (filename, from_tty) + char *filename; + int from_tty; +{ + int val; + extern char registers[]; + + /* Discard all vestiges of any previous core file + and mark data and stack spaces as empty. */ + + if (corefile) + free (corefile); + corefile = 0; + + if (corechan >= 0) + close (corechan); + corechan = -1; + + data_start = 0; + data_end = 0; + stack_start = STACK_END_ADDR; + stack_end = STACK_END_ADDR; + + /* Now, if a new core file was specified, open it and digest it. */ + + if (filename) + { + filename = tilde_expand (filename); + make_cleanup (free, filename); + + if (have_inferior_p ()) + error ("To look at a core file, you must kill the inferior with \"kill\"."); + corechan = open (filename, O_RDONLY, 0); + if (corechan < 0) + perror_with_name (filename); + + { + struct core corestr; + + val = myread (corechan, &corestr, sizeof corestr); + if (val < 0) + perror_with_name (filename); + if (corestr.c_magic != CORE_MAGIC) + error ("\"%s\" does not appear to be a core dump file (magic 0x%x, expected 0x%x)", + filename, corestr.c_magic, (int) CORE_MAGIC); + else if (sizeof (struct core) != corestr.c_len) + error ("\"%s\" has an invalid struct core length (%d, expected %d)", + filename, corestr.c_len, (int) sizeof (struct core)); + + data_start = exec_data_start; + data_end = data_start + corestr.c_dsize; + stack_start = stack_end - corestr.c_ssize; + data_offset = sizeof corestr; + stack_offset = sizeof corestr + corestr.c_dsize; + + bcopy (&corestr.c_regs, registers, sizeof corestr.c_regs); + + bcopy (corestr.c_fpu.f_fpstatus.f_st, + ®isters[REGISTER_BYTE (FP0_REGNUM)], + sizeof corestr.c_fpu.f_fpstatus.f_st); + bcopy (&corestr.c_fpu.f_fpstatus.f_ctrl, + ®isters[REGISTER_BYTE (FPC_REGNUM)], + sizeof corestr.c_fpu.f_fpstatus - + sizeof corestr.c_fpu.f_fpstatus.f_st); + + /* the struct aouthdr of sun coff is not the struct exec stored + in the core file. */ + bcopy (&corestr.c_aouthdr, &core_aouthdr, sizeof (struct exec)); +#ifndef COFF_ENCAPSULATE + core_aouthdr.magic = corestr.c_aouthdr.a_info; + core_aouthdr.vstamp = /*SUNVERSION*/ 31252; +#endif + printf ("Core file is from \"%s\".\n", corestr.c_cmdname); + if (corestr.c_signo > 0) + printf ("Program terminated with signal %d, %s.\n", + corestr.c_signo, safe_strsignal (corestr.c_signo)); + } + if (filename[0] == '/') + corefile = savestring (filename, strlen (filename)); + else + { + corefile = concat (current_directory, "/", filename, NULL); + } + + set_current_frame ( create_new_frame (read_register (FP_REGNUM), + read_pc ())); + select_frame (get_current_frame (), 0); + + validate_files (); + } + else if (from_tty) + printf ("No core file now.\n"); +} + +i387_to_double (from, to) + char *from; + char *to; +{ + long *lp; + /* push extended mode on 387 stack, then pop in double mode + * + * first, set exception masks so no error is generated - + * number will be rounded to inf or 0, if necessary + */ + asm ("pushl %eax"); /* grab a stack slot */ + asm ("fstcw (%esp)"); /* get 387 control word */ + asm ("movl (%esp),%eax"); /* save old value */ + asm ("orl $0x3f,%eax"); /* mask all exceptions */ + asm ("pushl %eax"); + asm ("fldcw (%esp)"); /* load new value into 387 */ + + asm ("movl 8(%ebp),%eax"); + asm ("fldt (%eax)"); /* push extended number on 387 stack */ + asm ("fwait"); + asm ("movl 12(%ebp),%eax"); + asm ("fstpl (%eax)"); /* pop double */ + asm ("fwait"); + + asm ("popl %eax"); /* flush modified control word */ + asm ("fnclex"); /* clear exceptions */ + asm ("fldcw (%esp)"); /* restore original control word */ + asm ("popl %eax"); /* flush saved copy */ +} + +double_to_i387 (from, to) + char *from; + char *to; +{ + /* push double mode on 387 stack, then pop in extended mode + * no errors are possible because every 64-bit pattern + * can be converted to an extended + */ + asm ("movl 8(%ebp),%eax"); + asm ("fldl (%eax)"); + asm ("fwait"); + asm ("movl 12(%ebp),%eax"); + asm ("fstpt (%eax)"); + asm ("fwait"); +} +#else /* Not sun386 target. */ + +/* These functions shouldn't be called when we're cross-debugging. */ + +/* ARGSUSED */ +void +fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr) + char *core_reg_sect; + unsigned core_reg_size; + int which; + unsigned int reg_addr; /* Unused in this version */ +{ +} + +#endif /* Not sun386 target. */ + +void +fetch_inferior_registers (regno) + int regno; +{ + struct regs inferior_registers; + struct fp_state inferior_fp_registers; + extern char registers[]; + + registers_fetched (); + + ptrace (PTRACE_GETREGS, inferior_pid, + (PTRACE_ARG3_TYPE) &inferior_registers); + ptrace (PTRACE_GETFPREGS, inferior_pid, + (PTRACE_ARG3_TYPE) &inferior_fp_registers); + + bcopy (&inferior_registers, registers, sizeof inferior_registers); + + bcopy (inferior_fp_registers.f_st,®isters[REGISTER_BYTE (FP0_REGNUM)], + sizeof inferior_fp_registers.f_st); + bcopy (&inferior_fp_registers.f_ctrl, + ®isters[REGISTER_BYTE (FPC_REGNUM)], + sizeof inferior_fp_registers - sizeof inferior_fp_registers.f_st); +} + +/* Store our register values back into the inferior. + If REGNO is -1, do this for all registers. + Otherwise, REGNO specifies which register (so we can save time). */ + +void +store_inferior_registers (regno) + int regno; +{ + struct regs inferior_registers; + struct fp_state inferior_fp_registers; + extern char registers[]; + + bcopy (registers, &inferior_registers, 20 * 4); + + bcopy (®isters[REGISTER_BYTE (FP0_REGNUM)],inferior_fp_registers.f_st, + sizeof inferior_fp_registers.f_st); + bcopy (®isters[REGISTER_BYTE (FPC_REGNUM)], + &inferior_fp_registers.f_ctrl, + sizeof inferior_fp_registers - sizeof inferior_fp_registers.f_st); + +#ifdef PTRACE_FP_BUG + if (regno == FP_REGNUM || regno == -1) + /* Storing the frame pointer requires a gross hack, in which an + instruction that moves eax into ebp gets single-stepped. */ + { + int stack = inferior_registers.r_reg[SP_REGNUM]; + int stuff = ptrace (PTRACE_PEEKDATA, inferior_pid, + (PTRACE_ARG3_TYPE) stack); + int reg = inferior_registers.r_reg[EAX]; + inferior_registers.r_reg[EAX] = + inferior_registers.r_reg[FP_REGNUM]; + ptrace (PTRACE_SETREGS, inferior_pid, + (PTRACE_ARG3_TYPE) &inferior_registers); + ptrace (PTRACE_POKEDATA, inferior_pid, (PTRACE_ARG3_TYPE) stack, + 0xc589); + ptrace (PTRACE_SINGLESTEP, inferior_pid, (PTRACE_ARG3_TYPE) stack, + 0); + wait (0); + ptrace (PTRACE_POKEDATA, inferior_pid, (PTRACE_ARG3_TYPE) stack, + stuff); + inferior_registers.r_reg[EAX] = reg; + } +#endif + ptrace (PTRACE_SETREGS, inferior_pid, + (PTRACE_ARG3_TYPE) &inferior_registers); + ptrace (PTRACE_SETFPREGS, inferior_pid, + (PTRACE_ARG3_TYPE) &inferior_fp_registers); +} + diff --git a/gdb/xm-sun386.h b/gdb/xm-sun386.h index aea5763..bbc4402 100644 --- a/gdb/xm-sun386.h +++ b/gdb/xm-sun386.h @@ -1,5 +1,5 @@ -/* Parameters for execution on a Sun 386i, for GDB, the GNU debugger. - Copyright (C) 1986, 1987, 1989 Free Software Foundation, Inc. +/* Host support for Sun 386i, for GDB, the GNU debugger. + Copyright (C) 1986, 1987, 1989, 1992 Free Software Foundation, Inc. This file is part of GDB. @@ -31,11 +31,4 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #define NEW_SUN_CORE -/* Do implement the attach and detach commands. */ - -#define ATTACH_DETACH - -/* Override copies of {fetch,store}_inferior_registers in infptrace.c. */ -#define FETCH_INFERIOR_REGISTERS - #define PREPARE_TO_STORE() read_register_bytes (0, NULL, REGISTER_BYTES) |