X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fi386b-nat.c;h=be8fd4508d4af7ed9b88bbc758d7979e2d904fbf;hb=49e790b035044a3a9916a34b478fcf273345a81e;hp=938b599caba6632c49ddcc0f556aa3c124cf8f0f;hpb=948a9d9233317319e9cf4bbc41b0a87c50ca0572;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/i386b-nat.c b/gdb/i386b-nat.c index 938b599cab..be8fd4508d 100644 --- a/gdb/i386b-nat.c +++ b/gdb/i386b-nat.c @@ -1,21 +1,23 @@ /* Native-dependent code for BSD Unix running on i386's, for GDB. - Copyright 1988, 1989, 1991, 1992, 1994, 1996 Free Software Foundation, Inc. + Copyright 1988, 1989, 1991, 1992, 1994, 1995, 1996, 1998, 1999, 2000, + 2001 Free Software Foundation, Inc. -This file is part of GDB. + 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 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. + 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. */ + 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. */ #include "defs.h" @@ -25,45 +27,45 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include #include #include "inferior.h" +#include "gdbcore.h" /* for registers_fetched() */ +#include "regcache.h" void -fetch_inferior_registers(regno) - int regno; +fetch_inferior_registers (int regno) { struct reg inferior_registers; - ptrace (PT_GETREGS, inferior_pid, (PTRACE_ARG3_TYPE) &inferior_registers, 0); - memcpy (®isters[REGISTER_BYTE (0)], &inferior_registers, 4*NUM_REGS); + ptrace (PT_GETREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) & inferior_registers, 0); + memcpy (®isters[REGISTER_BYTE (0)], &inferior_registers, 4 * NUM_REGS); registers_fetched (); } void -store_inferior_registers(regno) - int regno; +store_inferior_registers (int regno) { struct reg inferior_registers; - memcpy (&inferior_registers, ®isters[REGISTER_BYTE (0)], 4*NUM_REGS); - ptrace (PT_SETREGS, inferior_pid, (PTRACE_ARG3_TYPE) &inferior_registers, 0); + memcpy (&inferior_registers, ®isters[REGISTER_BYTE (0)], 4 * NUM_REGS); + ptrace (PT_SETREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) & inferior_registers, 0); } -struct md_core { +struct md_core +{ struct reg intreg; struct fpreg freg; }; void -fetch_core_registers (core_reg_sect, core_reg_size, which, ignore) - char *core_reg_sect; - unsigned core_reg_size; - int which; - CORE_ADDR ignore; +fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, int which, + CORE_ADDR ignore) { - struct md_core *core_reg = (struct md_core *)core_reg_sect; + struct md_core *core_reg = (struct md_core *) core_reg_sect; /* integer registers */ - memcpy(®isters[REGISTER_BYTE (0)], &core_reg->intreg, - sizeof(struct reg)); + memcpy (®isters[REGISTER_BYTE (0)], &core_reg->intreg, + sizeof (struct reg)); /* floating point registers */ /* XXX */ } @@ -74,7 +76,7 @@ fetch_core_registers (core_reg_sect, core_reg_size, which, ignore) /* this table must line up with REGISTER_NAMES in tm-i386.h */ /* symbols like 'tEAX' come from */ -static int tregmap[] = +static int tregmap[] = { tEAX, tECX, tEDX, tEBX, tESP, tEBP, tESI, tEDI, @@ -82,7 +84,7 @@ static int tregmap[] = }; #ifdef sEAX -static int sregmap[] = +static int sregmap[] = { sEAX, sECX, sEDX, sEBX, sESP, sEBP, sESI, sEDI, @@ -93,7 +95,7 @@ static int sregmap[] = /* FreeBSD has decided to collapse the s* and t* symbols. So if the s* ones aren't around, use the t* ones for sregmap too. */ -static int sregmap[] = +static int sregmap[] = { tEAX, tECX, tEDX, tEBX, tESP, tEBP, tESI, tEDI, @@ -105,9 +107,7 @@ static int sregmap[] = place where ES is stored. */ int -i386_register_u_addr (blockend, regnum) - int blockend; - int regnum; +i386_register_u_addr (int blockend, int regnum) { /* The following condition is a kludge to get at the proper register map depending upon the state of pcb_flag. @@ -125,7 +125,8 @@ i386_register_u_addr (blockend, regnum) #endif /* !FETCH_INFERIOR_REGISTERS */ #ifdef FLOAT_INFO -#include "language.h" /* for local_hex_string */ +#include "expression.h" +#include "language.h" /* for local_hex_string */ #include "floatformat.h" #include @@ -139,97 +140,103 @@ i386_register_u_addr (blockend, regnum) #include #include #include -#define curpcb Xcurpcb /* XXX avoid leaking declaration from pcb.h */ +#define curpcb Xcurpcb /* XXX avoid leaking declaration from pcb.h */ #include #undef curpcb #include #include "gdb_stat.h" #include -extern void print_387_control_word (); /* i387-tdep.h */ +extern void print_387_control_word (); /* i387-tdep.h */ extern void print_387_status_word (); #define fpstate save87 #define U_FPSTATE(u) u.u_pcb.pcb_savefpu -struct env387 -{ - unsigned short control; - unsigned short r0; - unsigned short status; - unsigned short r1; - unsigned short tag; - unsigned short r2; - unsigned long eip; - unsigned short code_seg; - unsigned short opcode; - unsigned long operand; - unsigned short operand_seg; - unsigned short r3; - unsigned char regs[8][10]; -}; +struct env387 + { + unsigned short control; + unsigned short r0; + unsigned short status; + unsigned short r1; + unsigned short tag; + unsigned short r2; + unsigned long eip; + unsigned short code_seg; + unsigned short opcode; + unsigned long operand; + unsigned short operand_seg; + unsigned short r3; + unsigned char regs[8][10]; + }; static void -print_387_status (status, ep) - unsigned short status; - struct env387 *ep; +print_387_status (unsigned short status, struct env387 *ep) { int i; int bothstatus; int top; int fpreg; - + bothstatus = ((status != 0) && (ep->status != 0)); - if (status != 0) + if (status != 0) { if (bothstatus) printf_unfiltered ("u: "); - print_387_status_word ((unsigned int)status); + print_387_status_word ((unsigned int) status); } - - if (ep->status != 0) + + if (ep->status != 0) { if (bothstatus) printf_unfiltered ("e: "); - print_387_status_word ((unsigned int)ep->status); + print_387_status_word ((unsigned int) ep->status); } - - print_387_control_word ((unsigned int)ep->control); + + print_387_control_word ((unsigned int) ep->control); printf_unfiltered ("last exception: "); - printf_unfiltered ("opcode %s; ", local_hex_string(ep->opcode)); - printf_unfiltered ("pc %s:", local_hex_string(ep->code_seg)); - printf_unfiltered ("%s; ", local_hex_string(ep->eip)); - printf_unfiltered ("operand %s", local_hex_string(ep->operand_seg)); - printf_unfiltered (":%s\n", local_hex_string(ep->operand)); + printf_unfiltered ("opcode %s; ", local_hex_string (ep->opcode)); + printf_unfiltered ("pc %s:", local_hex_string (ep->code_seg)); + printf_unfiltered ("%s; ", local_hex_string (ep->eip)); + printf_unfiltered ("operand %s", local_hex_string (ep->operand_seg)); + printf_unfiltered (":%s\n", local_hex_string (ep->operand)); top = (ep->status >> 11) & 7; - + printf_unfiltered ("regno tag msb lsb value\n"); - for (fpreg = 7; fpreg >= 0; fpreg--) + for (fpreg = 7; fpreg >= 0; fpreg--) { double val; - - printf_unfiltered ("%s %d: ", fpreg == top ? "=>" : " ", fpreg); - switch ((ep->tag >> (fpreg * 2)) & 3) + printf_unfiltered ("%s %d: ", fpreg == top ? "=>" : " ", fpreg); + + switch ((ep->tag >> (fpreg * 2)) & 3) { - case 0: printf_unfiltered ("valid "); break; - case 1: printf_unfiltered ("zero "); break; - case 2: printf_unfiltered ("trap "); break; - case 3: printf_unfiltered ("empty "); break; + case 0: + printf_unfiltered ("valid "); + break; + case 1: + printf_unfiltered ("zero "); + break; + case 2: + printf_unfiltered ("trap "); + break; + case 3: + printf_unfiltered ("empty "); + break; } for (i = 9; i >= 0; i--) printf_unfiltered ("%02x", ep->regs[fpreg][i]); - - floatformat_to_double(&floatformat_i387_ext, (char *) ep->regs[fpreg], - &val); + + floatformat_to_double (&floatformat_i387_ext, (char *) ep->regs[fpreg], + &val); printf_unfiltered (" %g\n", val); } } -i386_float_info () +i386_float_info (void) { - struct user u; /* just for address computations */ + struct user u; /* just for address computations */ int i; /* fpstate defined in */ struct fpstate *fpstatep; @@ -238,45 +245,45 @@ i386_float_info () char fpvalid; unsigned int rounded_addr; unsigned int rounded_size; - /*extern int corechan;*/ + /*extern int corechan; */ int skip; - extern int inferior_pid; - - uaddr = (char *)&U_FPSTATE(u) - (char *)&u; - if (inferior_pid) + + uaddr = (char *) &U_FPSTATE (u) - (char *) &u; + if (! ptid_equal (inferior_ptid, null_ptid)) { 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 = (int *) buf; + for (i = 0; i < rounded_size; i++) { - *ip++ = ptrace (PT_READ_U, inferior_pid, (caddr_t)rounded_addr, 0); + *ip++ = ptrace (PT_READ_U, PIDGET (inferior_ptid), + (caddr_t) rounded_addr, 0); rounded_addr += sizeof (int); } - } - else + } + else { - printf("float info: can't do a core file (yet)\n"); + printf ("float info: can't do a core file (yet)\n"); return; #if 0 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"); + if (myread (corechan, buf, sizeof (struct fpstate)) < 0) + perror_with_name ("read from core file"); skip = 0; #endif } - - print_387_status (0, (struct env387 *)buf); + + print_387_status (0, (struct env387 *) buf); } int -kernel_u_size () +kernel_u_size (void) { return (sizeof (struct user)); }