X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fi386v-nat.c;h=7125ba15db8b687f67a825ff533d350207e0d6cc;hb=24b06219744627c597d799c1aafb2b2322ac3c3e;hp=b5b2a301f6ec74156668807bc782340de1b1eae6;hpb=6c9638b444fd6ebdd189fe05c3e44dfbc95c878c;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/i386v-nat.c b/gdb/i386v-nat.c index b5b2a301f6..7125ba15db 100644 --- a/gdb/i386v-nat.c +++ b/gdb/i386v-nat.c @@ -1,32 +1,40 @@ -/* Intel 386 native support for SYSV systems (pre-SVR4). - Copyright (C) 1988, 1989, 1991, 1992, 1994 Free Software Foundation, Inc. +/* Intel 386 native support for System V systems (pre-SVR4). -This file is part of GDB. + Copyright (C) 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1998, + 1999, 2000, 2002 Free Software Foundation, Inc. -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 file is part of GDB. -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. + 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. -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. */ + 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., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ #include "defs.h" + +#ifdef HAVE_PTRACE_H +#include +#else +#ifdef HAVE_SYS_PTRACE_H +#include +#endif +#endif + #include "frame.h" #include "inferior.h" #include "language.h" #include "gdbcore.h" -#ifdef USG -#include -#endif - #include #include #include @@ -41,7 +49,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include #include "gdb_stat.h" -#ifndef NO_SYS_REG_H +#ifdef HAVE_SYS_REG_H #include #endif @@ -49,10 +57,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "target.h" +#include "i386-tdep.h" -/* this table must line up with REGISTER_NAMES in tm-i386v.h */ -/* symbols like 'EAX' come from */ -static int regmap[] = + +/* Mapping between the general-purpose registers in `struct user' + format and GDB's register array layout. */ +static int regmap[] = { EAX, ECX, EDX, EBX, UESP, EBP, ESI, EDI, @@ -60,32 +70,38 @@ static int regmap[] = DS, ES, FS, GS, }; -/* blockend is the value of u.u_ar0, and points to the - * place where GS is stored - */ +/* Support for the user struct. */ -int -i386_register_u_addr (blockend, regnum) - int blockend; - int regnum; +/* Return the address of register REGNUM. BLOCKEND is the value of + u.u_ar0, and points to the place where GS is stored. */ + +CORE_ADDR +register_u_addr (CORE_ADDR blockend, int regnum) { -#if 0 - /* this will be needed if fp registers are reinstated */ - /* for now, you can look at them with 'info float' - * sys5 wont let you change them with ptrace anyway - */ - if (regnum >= FP0_REGNUM && regnum <= FP7_REGNUM) + struct user u; + CORE_ADDR fpstate; + + if (i386_fp_regnum_p (regnum)) { - int ubase, fpstate; - struct user u; - ubase = blockend + 4 * (SS + 1) - KSTKSZ; - fpstate = ubase + ((char *)&u.u_fpstate - (char *)&u); +#ifdef KSTKSZ /* SCO, and others? */ + blockend += 4 * (SS + 1) - KSTKSZ; + fpstate = blockend + ((char *) &u.u_fps.u_fpstate - (char *) &u); return (fpstate + 0x1c + 10 * (regnum - FP0_REGNUM)); - } - else +#else + fpstate = blockend + ((char *) &u.i387.st_space - (char *) &u); + return (fpstate + 10 * (regnum - FP0_REGNUM)); #endif - return (blockend + 4 * regmap[regnum]); - + } + + return (blockend + 4 * regmap[regnum]); +} + +/* Return the size of the user struct. */ + +int +kernel_u_size (void) +{ + return (sizeof (struct user)); } #ifdef TARGET_HAS_HARDWARE_WATCHPOINTS @@ -100,39 +116,29 @@ static int debug_control_mirror; /* Record which address associates with which register. */ static CORE_ADDR address_lookup[DR_LASTADDR - DR_FIRSTADDR + 1]; -static int -i386_insert_aligned_watchpoint PARAMS ((int, CORE_ADDR, CORE_ADDR, int, - int)); +static int i386_insert_aligned_watchpoint (int, CORE_ADDR, CORE_ADDR, int, + int); -static int -i386_insert_nonaligned_watchpoint PARAMS ((int, CORE_ADDR, CORE_ADDR, int, - int)); +static int i386_insert_nonaligned_watchpoint (int, CORE_ADDR, CORE_ADDR, int, + int); /* Insert a watchpoint. */ int -i386_insert_watchpoint (pid, addr, len, rw) - int pid; - CORE_ADDR addr; - int len; - int rw; +i386_insert_watchpoint (int pid, CORE_ADDR addr, int len, int rw) { return i386_insert_aligned_watchpoint (pid, addr, addr, len, rw); } static int -i386_insert_aligned_watchpoint (pid, waddr, addr, len, rw) - int pid; - CORE_ADDR waddr; - CORE_ADDR addr; - int len; - int rw; +i386_insert_aligned_watchpoint (int pid, CORE_ADDR waddr, CORE_ADDR addr, + int len, int rw) { int i; int read_write_bits, len_bits; int free_debug_register; int register_number; - + /* Look for a free debug register. */ for (i = DR_FIRSTADDR; i <= DR_LASTADDR; i++) { @@ -144,7 +150,7 @@ i386_insert_aligned_watchpoint (pid, waddr, addr, len, rw) if (i > DR_LASTADDR) return -1; - read_write_bits = ((rw & 1) ? DR_RW_READ : 0) | ((rw & 2) ? DR_RW_WRITE : 0); + read_write_bits = (rw & 1) ? DR_RW_READ : DR_RW_WRITE; if (len == 1) len_bits = DR_LEN_1; @@ -163,7 +169,7 @@ i386_insert_aligned_watchpoint (pid, waddr, addr, len, rw) } else return i386_insert_nonaligned_watchpoint (pid, waddr, addr, len, rw); - + free_debug_register = i; register_number = free_debug_register - DR_FIRSTADDR; debug_control_mirror |= @@ -173,7 +179,7 @@ i386_insert_aligned_watchpoint (pid, waddr, addr, len, rw) (1 << (DR_LOCAL_ENABLE_SHIFT + DR_ENABLE_SIZE * register_number)); debug_control_mirror |= DR_LOCAL_SLOWDOWN; debug_control_mirror &= ~DR_CONTROL_RESERVED; - + ptrace (6, pid, offsetof (struct user, u_debugreg[DR_CONTROL]), debug_control_mirror); ptrace (6, pid, offsetof (struct user, u_debugreg[free_debug_register]), @@ -185,22 +191,19 @@ i386_insert_aligned_watchpoint (pid, waddr, addr, len, rw) } static int -i386_insert_nonaligned_watchpoint (pid, waddr, addr, len, rw) - int pid; - CORE_ADDR waddr; - CORE_ADDR addr; - int len; - int rw; +i386_insert_nonaligned_watchpoint (int pid, CORE_ADDR waddr, CORE_ADDR addr, + int len, int rw) { int align; int size; int rv; - static int size_try_array[16] = { - 1, 1, 1, 1, /* trying size one */ - 2, 1, 2, 1, /* trying size two */ - 2, 1, 2, 1, /* trying size three */ - 4, 1, 2, 1 /* trying size four */ + static int size_try_array[4][4] = + { + { 1, 1, 1, 1 }, /* trying size one */ + { 2, 1, 2, 1 }, /* trying size two */ + { 2, 1, 2, 1 }, /* trying size three */ + { 4, 1, 2, 1 } /* trying size four */ }; rv = 0; @@ -208,8 +211,7 @@ i386_insert_nonaligned_watchpoint (pid, waddr, addr, len, rw) { align = addr % 4; /* Four is the maximum length for 386. */ - size = (len > 4) ? 3 : len - 1; - size = size_try_array[size * 4 + align]; + size = size_try_array[len > 4 ? 3 : len - 1][align]; rv = i386_insert_aligned_watchpoint (pid, waddr, addr, size, rw); if (rv) @@ -226,10 +228,7 @@ i386_insert_nonaligned_watchpoint (pid, waddr, addr, len, rw) /* Remove a watchpoint. */ int -i386_remove_watchpoint (pid, addr, len) - int pid; - CORE_ADDR addr; - int len; +i386_remove_watchpoint (int pid, CORE_ADDR addr, int len) { int i; int register_number; @@ -254,8 +253,7 @@ i386_remove_watchpoint (pid, addr, len) /* Check if stopped by a watchpoint. */ CORE_ADDR -i386_stopped_by_watchpoint (pid) - int pid; +i386_stopped_by_watchpoint (int pid) { int i; int status; @@ -273,88 +271,3 @@ i386_stopped_by_watchpoint (pid) } #endif /* TARGET_HAS_HARDWARE_WATCHPOINTS */ - -#if 0 -/* using FLOAT_INFO as is would be a problem. FLOAT_INFO is called - via a command xxx and eventually calls ptrace without ever having - traversed the target vector. This would be terribly impolite - behaviour for a sun4 hosted remote gdb. - - A fix might be to move this code into the "info registers" command. - rich@cygnus.com 15 Sept 92. */ -i386_float_info () -{ - struct user u; /* just for address computations */ - int i; - /* fpstate defined in */ - struct fpstate *fpstatep; - char buf[sizeof (struct fpstate) + 2 * sizeof (int)]; - unsigned int uaddr; - char fpvalid = 0; - unsigned int rounded_addr; - unsigned int rounded_size; - extern int corechan; - int skip; - - uaddr = (char *)&u.u_fpvalid - (char *)&u; - if (target_has_execution) - { - unsigned int data; - unsigned int mask; - - rounded_addr = uaddr & -sizeof (int); - data = ptrace (3, inferior_pid, (PTRACE_ARG3_TYPE) rounded_addr, 0); - mask = 0xff << ((uaddr - rounded_addr) * 8); - - fpvalid = ((data & mask) != 0); - } -#if 0 - else - { - if (lseek (corechan, uaddr, 0) < 0) - perror ("seek on core file"); - if (myread (corechan, &fpvalid, 1) < 0) - perror ("read on core file"); - - } -#endif /* no core support yet */ - - if (fpvalid == 0) - { - printf_unfiltered ("no floating point status saved\n"); - return; - } - - uaddr = (char *)&U_FPSTATE(u) - (char *)&u; - if (target_has_execution) - { - int *ip; - - rounded_addr = uaddr & -sizeof (int); - rounded_size = (((uaddr + sizeof (struct fpstate)) - uaddr) + - sizeof (int) - 1) / sizeof (int); - skip = uaddr - rounded_addr; - - ip = (int *)buf; - for (i = 0; i < rounded_size; i++) - { - *ip++ = ptrace (3, inferior_pid, (PTRACE_ARG3_TYPE) rounded_addr, 0); - rounded_addr += sizeof (int); - } - } -#if 0 - else - { - if (lseek (corechan, uaddr, 0) < 0) - perror_with_name ("seek on core file"); - if (myread (corechan, buf, sizeof (struct fpstate)) < 0) - perror_with_name ("read from core file"); - skip = 0; - } -#endif /* 0 */ - - fpstatep = (struct fpstate *)(buf + skip); - print_387_status (fpstatep->status, (struct env387 *)fpstatep->state); -} - -#endif /* never */