X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Flynx-nat.c;h=9cd1672d3362e81760b88304176edfb3be8ca757;hb=7fc44b9cd621f388b62375fa9f2f882c679a6eac;hp=f006aa46c9c349eae9d74af7c11dda7547bc32d2;hpb=8b0b198558d0fc981f129e2e3dcbe00a0f308449;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/lynx-nat.c b/gdb/lynx-nat.c index f006aa46c9..9cd1672d33 100644 --- a/gdb/lynx-nat.c +++ b/gdb/lynx-nat.c @@ -1,34 +1,37 @@ /* Native-dependent code for LynxOS. - Copyright 1993, 1994 Free Software Foundation, Inc. + Copyright 1993, 1994, 1995, 1996, 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" #include "frame.h" #include "inferior.h" #include "target.h" #include "gdbcore.h" +#include "regcache.h" #include #include #include -static unsigned long registers_addr PARAMS ((int pid)); -static void fetch_core_registers PARAMS ((char *, unsigned, int, CORE_ADDR); +static unsigned long registers_addr (int pid); +static void fetch_core_registers (char *, unsigned, int, CORE_ADDR); #define X(ENTRY)(offsetof(struct econtext, ENTRY)) @@ -37,22 +40,22 @@ static void fetch_core_registers PARAMS ((char *, unsigned, int, CORE_ADDR); static int regmap[] = { - X(eax), - X(ecx), - X(edx), - X(ebx), - X(esp), /* sp */ - X(ebp), /* fp */ - X(esi), - X(edi), - X(eip), /* pc */ - X(flags), /* ps */ - X(cs), - X(ss), - X(ds), - X(es), - X(ecode), /* Lynx doesn't give us either fs or gs, so */ - X(fault), /* we just substitute these two in the hopes + X (eax), + X (ecx), + X (edx), + X (ebx), + X (esp), /* sp */ + X (ebp), /* fp */ + X (esi), + X (edi), + X (eip), /* pc */ + X (flags), /* ps */ + X (cs), + X (ss), + X (ds), + X (es), + X (ecode), /* Lynx doesn't give us either fs or gs, so */ + X (fault), /* we just substitute these two in the hopes that they are useful. */ }; #endif /* I386 */ @@ -62,39 +65,39 @@ static int regmap[] = static int regmap[] = { - X(regs[0]), /* d0 */ - X(regs[1]), /* d1 */ - X(regs[2]), /* d2 */ - X(regs[3]), /* d3 */ - X(regs[4]), /* d4 */ - X(regs[5]), /* d5 */ - X(regs[6]), /* d6 */ - X(regs[7]), /* d7 */ - X(regs[8]), /* a0 */ - X(regs[9]), /* a1 */ - X(regs[10]), /* a2 */ - X(regs[11]), /* a3 */ - X(regs[12]), /* a4 */ - X(regs[13]), /* a5 */ - X(regs[14]), /* fp */ - offsetof (st_t, usp) - offsetof (st_t, ec), /* sp */ - X(status), /* ps */ - X(pc), - - X(fregs[0*3]), /* fp0 */ - X(fregs[1*3]), /* fp1 */ - X(fregs[2*3]), /* fp2 */ - X(fregs[3*3]), /* fp3 */ - X(fregs[4*3]), /* fp4 */ - X(fregs[5*3]), /* fp5 */ - X(fregs[6*3]), /* fp6 */ - X(fregs[7*3]), /* fp7 */ - - X(fcregs[0]), /* fpcontrol */ - X(fcregs[1]), /* fpstatus */ - X(fcregs[2]), /* fpiaddr */ - X(ssw), /* fpcode */ - X(fault), /* fpflags */ + X (regs[0]), /* d0 */ + X (regs[1]), /* d1 */ + X (regs[2]), /* d2 */ + X (regs[3]), /* d3 */ + X (regs[4]), /* d4 */ + X (regs[5]), /* d5 */ + X (regs[6]), /* d6 */ + X (regs[7]), /* d7 */ + X (regs[8]), /* a0 */ + X (regs[9]), /* a1 */ + X (regs[10]), /* a2 */ + X (regs[11]), /* a3 */ + X (regs[12]), /* a4 */ + X (regs[13]), /* a5 */ + X (regs[14]), /* fp */ + offsetof (st_t, usp) - offsetof (st_t, ec), /* sp */ + X (status), /* ps */ + X (pc), + + X (fregs[0 * 3]), /* fp0 */ + X (fregs[1 * 3]), /* fp1 */ + X (fregs[2 * 3]), /* fp2 */ + X (fregs[3 * 3]), /* fp3 */ + X (fregs[4 * 3]), /* fp4 */ + X (fregs[5 * 3]), /* fp5 */ + X (fregs[6 * 3]), /* fp6 */ + X (fregs[7 * 3]), /* fp7 */ + + X (fcregs[0]), /* fpcontrol */ + X (fcregs[1]), /* fpstatus */ + X (fcregs[2]), /* fpiaddr */ + X (ssw), /* fpcode */ + X (fault), /* fpflags */ }; #endif /* M68K */ @@ -106,67 +109,67 @@ static int regmap[] = static int regmap[] = { -1, /* g0 */ - X(g1), - X(g2), - X(g3), - X(g4), + X (g1), + X (g2), + X (g3), + X (g4), -1, /* g5->g7 aren't saved by Lynx */ -1, -1, - X(o[0]), - X(o[1]), - X(o[2]), - X(o[3]), - X(o[4]), - X(o[5]), - X(o[6]), /* sp */ - X(o[7]), /* ra */ - - -1,-1,-1,-1,-1,-1,-1,-1, /* l0 -> l7 */ - - -1,-1,-1,-1,-1,-1,-1,-1, /* i0 -> i7 */ - - FX(f.fregs[0]), /* f0 */ - FX(f.fregs[1]), - FX(f.fregs[2]), - FX(f.fregs[3]), - FX(f.fregs[4]), - FX(f.fregs[5]), - FX(f.fregs[6]), - FX(f.fregs[7]), - FX(f.fregs[8]), - FX(f.fregs[9]), - FX(f.fregs[10]), - FX(f.fregs[11]), - FX(f.fregs[12]), - FX(f.fregs[13]), - FX(f.fregs[14]), - FX(f.fregs[15]), - FX(f.fregs[16]), - FX(f.fregs[17]), - FX(f.fregs[18]), - FX(f.fregs[19]), - FX(f.fregs[20]), - FX(f.fregs[21]), - FX(f.fregs[22]), - FX(f.fregs[23]), - FX(f.fregs[24]), - FX(f.fregs[25]), - FX(f.fregs[26]), - FX(f.fregs[27]), - FX(f.fregs[28]), - FX(f.fregs[29]), - FX(f.fregs[30]), - FX(f.fregs[31]), - - X(y), - X(psr), - X(wim), - X(tbr), - X(pc), - X(npc), - FX(fsr), /* fpsr */ + X (o[0]), + X (o[1]), + X (o[2]), + X (o[3]), + X (o[4]), + X (o[5]), + X (o[6]), /* sp */ + X (o[7]), /* ra */ + + -1, -1, -1, -1, -1, -1, -1, -1, /* l0 -> l7 */ + + -1, -1, -1, -1, -1, -1, -1, -1, /* i0 -> i7 */ + + FX (f.fregs[0]), /* f0 */ + FX (f.fregs[1]), + FX (f.fregs[2]), + FX (f.fregs[3]), + FX (f.fregs[4]), + FX (f.fregs[5]), + FX (f.fregs[6]), + FX (f.fregs[7]), + FX (f.fregs[8]), + FX (f.fregs[9]), + FX (f.fregs[10]), + FX (f.fregs[11]), + FX (f.fregs[12]), + FX (f.fregs[13]), + FX (f.fregs[14]), + FX (f.fregs[15]), + FX (f.fregs[16]), + FX (f.fregs[17]), + FX (f.fregs[18]), + FX (f.fregs[19]), + FX (f.fregs[20]), + FX (f.fregs[21]), + FX (f.fregs[22]), + FX (f.fregs[23]), + FX (f.fregs[24]), + FX (f.fregs[25]), + FX (f.fregs[26]), + FX (f.fregs[27]), + FX (f.fregs[28]), + FX (f.fregs[29]), + FX (f.fregs[30]), + FX (f.fregs[31]), + + X (y), + X (psr), + X (wim), + X (tbr), + X (pc), + X (npc), + FX (fsr), /* fpsr */ -1, /* cpsr */ }; #endif /* SPARC */ @@ -175,79 +178,79 @@ static int regmap[] = static int regmap[] = { - X(iregs[0]), /* r0 */ - X(iregs[1]), - X(iregs[2]), - X(iregs[3]), - X(iregs[4]), - X(iregs[5]), - X(iregs[6]), - X(iregs[7]), - X(iregs[8]), - X(iregs[9]), - X(iregs[10]), - X(iregs[11]), - X(iregs[12]), - X(iregs[13]), - X(iregs[14]), - X(iregs[15]), - X(iregs[16]), - X(iregs[17]), - X(iregs[18]), - X(iregs[19]), - X(iregs[20]), - X(iregs[21]), - X(iregs[22]), - X(iregs[23]), - X(iregs[24]), - X(iregs[25]), - X(iregs[26]), - X(iregs[27]), - X(iregs[28]), - X(iregs[29]), - X(iregs[30]), - X(iregs[31]), - - X(fregs[0]), /* f0 */ - X(fregs[1]), - X(fregs[2]), - X(fregs[3]), - X(fregs[4]), - X(fregs[5]), - X(fregs[6]), - X(fregs[7]), - X(fregs[8]), - X(fregs[9]), - X(fregs[10]), - X(fregs[11]), - X(fregs[12]), - X(fregs[13]), - X(fregs[14]), - X(fregs[15]), - X(fregs[16]), - X(fregs[17]), - X(fregs[18]), - X(fregs[19]), - X(fregs[20]), - X(fregs[21]), - X(fregs[22]), - X(fregs[23]), - X(fregs[24]), - X(fregs[25]), - X(fregs[26]), - X(fregs[27]), - X(fregs[28]), - X(fregs[29]), - X(fregs[30]), - X(fregs[31]), - - X(srr0), /* IAR (PC) */ - X(srr1), /* MSR (PS) */ - X(cr), /* CR */ - X(lr), /* LR */ - X(ctr), /* CTR */ - X(xer), /* XER */ - X(mq) /* MQ */ + X (iregs[0]), /* r0 */ + X (iregs[1]), + X (iregs[2]), + X (iregs[3]), + X (iregs[4]), + X (iregs[5]), + X (iregs[6]), + X (iregs[7]), + X (iregs[8]), + X (iregs[9]), + X (iregs[10]), + X (iregs[11]), + X (iregs[12]), + X (iregs[13]), + X (iregs[14]), + X (iregs[15]), + X (iregs[16]), + X (iregs[17]), + X (iregs[18]), + X (iregs[19]), + X (iregs[20]), + X (iregs[21]), + X (iregs[22]), + X (iregs[23]), + X (iregs[24]), + X (iregs[25]), + X (iregs[26]), + X (iregs[27]), + X (iregs[28]), + X (iregs[29]), + X (iregs[30]), + X (iregs[31]), + + X (fregs[0]), /* f0 */ + X (fregs[1]), + X (fregs[2]), + X (fregs[3]), + X (fregs[4]), + X (fregs[5]), + X (fregs[6]), + X (fregs[7]), + X (fregs[8]), + X (fregs[9]), + X (fregs[10]), + X (fregs[11]), + X (fregs[12]), + X (fregs[13]), + X (fregs[14]), + X (fregs[15]), + X (fregs[16]), + X (fregs[17]), + X (fregs[18]), + X (fregs[19]), + X (fregs[20]), + X (fregs[21]), + X (fregs[22]), + X (fregs[23]), + X (fregs[24]), + X (fregs[25]), + X (fregs[26]), + X (fregs[27]), + X (fregs[28]), + X (fregs[29]), + X (fregs[30]), + X (fregs[31]), + + X (srr0), /* IAR (PC) */ + X (srr1), /* MSR (PS) */ + X (cr), /* CR */ + X (lr), /* LR */ + X (ctr), /* CTR */ + X (xer), /* XER */ + X (mq) /* MQ */ }; #endif /* rs6000 */ @@ -259,8 +262,7 @@ static int regmap[] = It also handles knows where to find the I & L regs on the stack. */ void -fetch_inferior_registers (regno) - int regno; +fetch_inferior_registers (int regno) { int whatregs = 0; @@ -279,31 +281,31 @@ fetch_inferior_registers (regno) if (whatregs & WHATREGS_GEN) { - struct econtext ec; /* general regs */ + struct econtext ec; /* general regs */ char buf[MAX_REGISTER_RAW_SIZE]; int retval; int i; errno = 0; - retval = ptrace (PTRACE_GETREGS, inferior_pid, (PTRACE_ARG3_TYPE) &ec, - 0); + retval = ptrace (PTRACE_GETREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) & ec, 0); if (errno) perror_with_name ("ptrace(PTRACE_GETREGS)"); - + memset (buf, 0, REGISTER_RAW_SIZE (G0_REGNUM)); supply_register (G0_REGNUM, buf); - supply_register (TBR_REGNUM, (char *)&ec.tbr); + supply_register (TBR_REGNUM, (char *) &ec.tbr); memcpy (®isters[REGISTER_BYTE (G1_REGNUM)], &ec.g1, 4 * REGISTER_RAW_SIZE (G1_REGNUM)); for (i = G1_REGNUM; i <= G1_REGNUM + 3; i++) register_valid[i] = 1; - supply_register (PS_REGNUM, (char *)&ec.psr); - supply_register (Y_REGNUM, (char *)&ec.y); - supply_register (PC_REGNUM, (char *)&ec.pc); - supply_register (NPC_REGNUM, (char *)&ec.npc); - supply_register (WIM_REGNUM, (char *)&ec.wim); + supply_register (PS_REGNUM, (char *) &ec.psr); + supply_register (Y_REGNUM, (char *) &ec.y); + supply_register (PC_REGNUM, (char *) &ec.pc); + supply_register (NPC_REGNUM, (char *) &ec.npc); + supply_register (WIM_REGNUM, (char *) &ec.wim); memcpy (®isters[REGISTER_BYTE (O0_REGNUM)], ec.o, 8 * REGISTER_RAW_SIZE (O0_REGNUM)); @@ -318,37 +320,37 @@ fetch_inferior_registers (regno) sp = read_register (SP_REGNUM); - target_xfer_memory (sp + FRAME_SAVED_I0, - ®isters[REGISTER_BYTE(I0_REGNUM)], - 8 * REGISTER_RAW_SIZE (I0_REGNUM), 0); + target_read_memory (sp + FRAME_SAVED_I0, + ®isters[REGISTER_BYTE (I0_REGNUM)], + 8 * REGISTER_RAW_SIZE (I0_REGNUM)); for (i = I0_REGNUM; i <= I7_REGNUM; i++) register_valid[i] = 1; - target_xfer_memory (sp + FRAME_SAVED_L0, - ®isters[REGISTER_BYTE(L0_REGNUM)], - 8 * REGISTER_RAW_SIZE (L0_REGNUM), 0); + target_read_memory (sp + FRAME_SAVED_L0, + ®isters[REGISTER_BYTE (L0_REGNUM)], + 8 * REGISTER_RAW_SIZE (L0_REGNUM)); for (i = L0_REGNUM; i <= L0_REGNUM + 7; i++) register_valid[i] = 1; } if (whatregs & WHATREGS_FLOAT) { - struct fcontext fc; /* fp regs */ + struct fcontext fc; /* fp regs */ int retval; int i; errno = 0; - retval = ptrace (PTRACE_GETFPREGS, inferior_pid, (PTRACE_ARG3_TYPE) &fc, - 0); + retval = ptrace (PTRACE_GETFPREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) & fc, 0); if (errno) perror_with_name ("ptrace(PTRACE_GETFPREGS)"); - + memcpy (®isters[REGISTER_BYTE (FP0_REGNUM)], fc.f.fregs, 32 * REGISTER_RAW_SIZE (FP0_REGNUM)); for (i = FP0_REGNUM; i <= FP0_REGNUM + 31; i++) register_valid[i] = 1; - supply_register (FPS_REGNUM, (char *)&fc.fsr); + supply_register (FPS_REGNUM, (char *) &fc.fsr); } } @@ -360,8 +362,7 @@ fetch_inferior_registers (regno) this point. */ void -store_inferior_registers (regno) - int regno; +store_inferior_registers (int regno) { int whatregs = 0; @@ -378,7 +379,7 @@ store_inferior_registers (regno) if (whatregs & WHATREGS_GEN) { - struct econtext ec; /* general regs */ + struct econtext ec; /* general regs */ int retval; ec.tbr = read_register (TBR_REGNUM); @@ -395,8 +396,8 @@ store_inferior_registers (regno) 8 * REGISTER_RAW_SIZE (O0_REGNUM)); errno = 0; - retval = ptrace (PTRACE_SETREGS, inferior_pid, (PTRACE_ARG3_TYPE) &ec, - 0); + retval = ptrace (PTRACE_SETREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) & ec, 0); if (errno) perror_with_name ("ptrace(PTRACE_SETREGS)"); } @@ -410,54 +411,55 @@ store_inferior_registers (regno) if (regno == -1 || regno == SP_REGNUM) { - if (!register_valid[L0_REGNUM+5]) - abort(); - target_xfer_memory (sp + FRAME_SAVED_I0, + if (!register_valid[L0_REGNUM + 5]) + internal_error (__FILE__, __LINE__, "failed internal consistency check"); + target_write_memory (sp + FRAME_SAVED_I0, ®isters[REGISTER_BYTE (I0_REGNUM)], - 8 * REGISTER_RAW_SIZE (I0_REGNUM), 1); + 8 * REGISTER_RAW_SIZE (I0_REGNUM)); - target_xfer_memory (sp + FRAME_SAVED_L0, + target_write_memory (sp + FRAME_SAVED_L0, ®isters[REGISTER_BYTE (L0_REGNUM)], - 8 * REGISTER_RAW_SIZE (L0_REGNUM), 1); + 8 * REGISTER_RAW_SIZE (L0_REGNUM)); } else if (regno >= L0_REGNUM && regno <= I7_REGNUM) { if (!register_valid[regno]) - abort(); + internal_error (__FILE__, __LINE__, "failed internal consistency check"); if (regno >= L0_REGNUM && regno <= L0_REGNUM + 7) regoffset = REGISTER_BYTE (regno) - REGISTER_BYTE (L0_REGNUM) + FRAME_SAVED_L0; else regoffset = REGISTER_BYTE (regno) - REGISTER_BYTE (I0_REGNUM) + FRAME_SAVED_I0; - target_xfer_memory (sp + regoffset, ®isters[REGISTER_BYTE (regno)], - REGISTER_RAW_SIZE (regno), 1); + target_write_memory (sp + regoffset, + ®isters[REGISTER_BYTE (regno)], + REGISTER_RAW_SIZE (regno)); } } if (whatregs & WHATREGS_FLOAT) { - struct fcontext fc; /* fp regs */ + struct fcontext fc; /* fp regs */ int retval; /* We read fcontext first so that we can get good values for fq_t... */ errno = 0; - retval = ptrace (PTRACE_GETFPREGS, inferior_pid, (PTRACE_ARG3_TYPE) &fc, - 0); + retval = ptrace (PTRACE_GETFPREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) & fc, 0); if (errno) perror_with_name ("ptrace(PTRACE_GETFPREGS)"); - + memcpy (fc.f.fregs, ®isters[REGISTER_BYTE (FP0_REGNUM)], 32 * REGISTER_RAW_SIZE (FP0_REGNUM)); fc.fsr = read_register (FPS_REGNUM); errno = 0; - retval = ptrace (PTRACE_SETFPREGS, inferior_pid, (PTRACE_ARG3_TYPE) &fc, - 0); + retval = ptrace (PTRACE_SETFPREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) & fc, 0); if (errno) perror_with_name ("ptrace(PTRACE_SETFPREGS)"); - } + } } #endif /* SPARC */ @@ -467,20 +469,19 @@ store_inferior_registers (regno) saved context block. */ static unsigned long -registers_addr(pid) - int pid; +registers_addr (int pid) { CORE_ADDR stblock; - int ecpoff = offsetof(st_t, ecp); + int ecpoff = offsetof (st_t, ecp); CORE_ADDR ecp; errno = 0; - stblock = (CORE_ADDR) ptrace (PTRACE_THREADUSER, pid, (PTRACE_ARG3_TYPE)0, + stblock = (CORE_ADDR) ptrace (PTRACE_THREADUSER, pid, (PTRACE_ARG3_TYPE) 0, 0); if (errno) perror_with_name ("ptrace(PTRACE_THREADUSER)"); - ecp = (CORE_ADDR) ptrace (PTRACE_PEEKTHREAD, pid, (PTRACE_ARG3_TYPE)ecpoff, + ecp = (CORE_ADDR) ptrace (PTRACE_PEEKTHREAD, pid, (PTRACE_ARG3_TYPE) ecpoff, 0); if (errno) perror_with_name ("ptrace(PTRACE_PEEKTHREAD)"); @@ -493,8 +494,7 @@ registers_addr(pid) marking them as valid so we won't fetch them again. */ void -fetch_inferior_registers (regno) - int regno; +fetch_inferior_registers (int regno) { int reglo, reghi; int i; @@ -508,7 +508,7 @@ fetch_inferior_registers (regno) else reglo = reghi = regno; - ecp = registers_addr (inferior_pid); + ecp = registers_addr (PIDGET (inferior_ptid)); for (regno = reglo; regno <= reghi; regno++) { @@ -524,12 +524,12 @@ fetch_inferior_registers (regno) unsigned int reg; errno = 0; - reg = ptrace (ptrace_fun, inferior_pid, + reg = ptrace (ptrace_fun, PIDGET (inferior_ptid), (PTRACE_ARG3_TYPE) (ecp + regmap[regno] + i), 0); if (errno) perror_with_name ("ptrace(PTRACE_PEEKUSP)"); - - *(int *)&buf[i] = reg; + + *(int *) &buf[i] = reg; } supply_register (regno, buf); } @@ -539,14 +539,8 @@ fetch_inferior_registers (regno) If REGNO is -1, do this for all registers. Otherwise, REGNO specifies which register (so we can save time). */ -/* Registers we shouldn't try to store. */ -#if !defined (CANNOT_STORE_REGISTER) -#define CANNOT_STORE_REGISTER(regno) 0 -#endif - void -store_inferior_registers (regno) - int regno; +store_inferior_registers (int regno) { int reglo, reghi; int i; @@ -560,7 +554,7 @@ store_inferior_registers (regno) else reglo = reghi = regno; - ecp = registers_addr (inferior_pid); + ecp = registers_addr (PIDGET (inferior_ptid)); for (regno = reglo; regno <= reghi; regno++) { @@ -577,10 +571,10 @@ store_inferior_registers (regno) { unsigned int reg; - reg = *(unsigned int *)®isters[REGISTER_BYTE (regno) + i]; + reg = *(unsigned int *) ®isters[REGISTER_BYTE (regno) + i]; errno = 0; - ptrace (ptrace_fun, inferior_pid, + ptrace (ptrace_fun, PIDGET (inferior_ptid), (PTRACE_ARG3_TYPE) (ecp + regmap[regno] + i), reg); if (errno) perror_with_name ("ptrace(PTRACE_POKEUSP)"); @@ -592,101 +586,102 @@ store_inferior_registers (regno) /* Wait for child to do something. Return pid of child, or -1 in case of error; store status through argument pointer OURSTATUS. */ -int -child_wait (pid, ourstatus) - int pid; - struct target_waitstatus *ourstatus; +ptid_t +child_wait (ptid_t ptid, struct target_waitstatus *ourstatus) { int save_errno; int thread; union wait status; + int pid; while (1) { int sig; - set_sigint_trap(); /* Causes SIGINT to be passed on to the + set_sigint_trap (); /* Causes SIGINT to be passed on to the attached process. */ pid = wait (&status); save_errno = errno; - clear_sigint_trap(); + clear_sigint_trap (); if (pid == -1) { if (save_errno == EINTR) continue; fprintf_unfiltered (gdb_stderr, "Child process unexpectedly missing: %s.\n", - safe_strerror (save_errno)); + safe_strerror (save_errno)); /* Claim it exited with unknown signal. */ ourstatus->kind = TARGET_WAITKIND_SIGNALLED; ourstatus->value.sig = TARGET_SIGNAL_UNKNOWN; return -1; } - if (pid != PIDGET (inferior_pid)) /* Some other process?!? */ + if (pid != PIDGET (inferior_ptid)) /* Some other process?!? */ continue; thread = status.w_tid; /* Get thread id from status */ /* Initial thread value can only be acquired via wait, so we have to - resort to this hack. */ + resort to this hack. */ - if (TIDGET (inferior_pid) == 0 && thread != 0) + if (TIDGET (inferior_ptid) == 0 && thread != 0) { - inferior_pid = BUILDPID (inferior_pid, thread); - add_thread (inferior_pid); + inferior_ptid = MERGEPID (PIDGET (inferior_ptid), thread); + add_thread (inferior_ptid); } - pid = BUILDPID (pid, thread); + ptid = BUILDPID (pid, thread); /* We've become a single threaded process again. */ if (thread == 0) - inferior_pid = pid; + inferior_ptid = ptid; /* Check for thread creation. */ - if (WIFSTOPPED(status) - && WSTOPSIG(status) == SIGTRAP - && !in_thread_list (pid)) + if (WIFSTOPPED (status) + && WSTOPSIG (status) == SIGTRAP + && !in_thread_list (ptid)) { int realsig; - realsig = ptrace (PTRACE_GETTRACESIG, pid, (PTRACE_ARG3_TYPE)0, 0); + realsig = ptrace (PTRACE_GETTRACESIG, PIDGET (ptid), + (PTRACE_ARG3_TYPE) 0, 0); if (realsig == SIGNEWTHREAD) { /* It's a new thread notification. We don't want to much with - realsig -- the code in wait_for_inferior expects SIGTRAP. */ + realsig -- the code in wait_for_inferior expects SIGTRAP. */ ourstatus->kind = TARGET_WAITKIND_SPURIOUS; ourstatus->value.sig = TARGET_SIGNAL_0; - return pid; + return ptid; } else error ("Signal for unknown thread was not SIGNEWTHREAD"); } /* Check for thread termination. */ - else if (WIFSTOPPED(status) - && WSTOPSIG(status) == SIGTRAP - && in_thread_list (pid)) + else if (WIFSTOPPED (status) + && WSTOPSIG (status) == SIGTRAP + && in_thread_list (ptid)) { int realsig; - realsig = ptrace (PTRACE_GETTRACESIG, pid, (PTRACE_ARG3_TYPE)0, 0); + realsig = ptrace (PTRACE_GETTRACESIG, PIDGET (ptid), + (PTRACE_ARG3_TYPE) 0, 0); if (realsig == SIGTHREADEXIT) { - ptrace (PTRACE_CONT, PIDGET (pid), (PTRACE_ARG3_TYPE)0, 0); + ptrace (PTRACE_CONT, PIDGET (ptid), (PTRACE_ARG3_TYPE) 0, 0); continue; } } #ifdef SPARC /* SPARC Lynx uses an byte reversed wait status; we must use the - host macros to access it. These lines just a copy of - store_waitstatus. We can't use CHILD_SPECIAL_WAITSTATUS - because target.c can't include the Lynx . */ + host macros to access it. These lines just a copy of + store_waitstatus. We can't use CHILD_SPECIAL_WAITSTATUS + because target.c can't include the Lynx . */ if (WIFEXITED (status)) { ourstatus->kind = TARGET_WAITKIND_EXITED; @@ -708,15 +703,16 @@ child_wait (pid, ourstatus) store_waitstatus (ourstatus, status.w_status); #endif - return pid; + return ptid; } } /* Return nonzero if the given thread is still alive. */ int -child_thread_alive (pid) - int pid; +child_thread_alive (ptid_t ptid) { + int pid = PIDGET (ptid); + /* Arggh. Apparently pthread_kill only works for threads within the process that calls pthread_kill. @@ -734,12 +730,10 @@ child_thread_alive (pid) If SIGNAL is nonzero, give it that signal. */ void -child_resume (pid, step, signal) - int pid; - int step; - enum target_signal signal; +child_resume (ptid_t ptid, int step, enum target_signal signal) { int func; + int pid = PIDGET (ptid); errno = 0; @@ -747,7 +741,7 @@ child_resume (pid, step, signal) we only want to step/continue a single thread. */ if (pid == -1) { - pid = inferior_pid; + pid = PIDGET (inferior_ptid); func = step ? PTRACE_SINGLESTEP : PTRACE_CONT; } else @@ -773,12 +767,11 @@ child_resume (pid, step, signal) buffer. */ char * -lynx_pid_to_str (pid) - int pid; +child_pid_to_str (ptid_t ptid) { static char buf[40]; - sprintf (buf, "process %d thread %d", PIDGET (pid), TIDGET (pid)); + sprintf (buf, "process %d thread %d", PIDGET (ptid), TIDGET (ptid)); return buf; } @@ -789,19 +782,16 @@ lynx_pid_to_str (pid) CORE_REG_SECT points to the register values themselves, read into memory. CORE_REG_SIZE is the size of that area. WHICH says which set of registers we are handling (0 = int, 2 = float - on machines where they are discontiguous). + on machines where they are discontiguous). REG_ADDR is the offset from u.u_ar0 to the register values relative to - core_reg_sect. This is used with old-fashioned core files to - locate the registers in a large upage-plus-stack ".reg" section. - Original upage address X is at location core_reg_sect+x+reg_addr. + core_reg_sect. This is used with old-fashioned core files to + locate the registers in a large upage-plus-stack ".reg" section. + Original upage address X is at location core_reg_sect+x+reg_addr. */ static void -fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr) - char *core_reg_sect; - unsigned core_reg_size; - int which; - CORE_ADDR reg_addr; +fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, int which, + CORE_ADDR reg_addr) { struct st_entry s; unsigned int regno; @@ -818,20 +808,22 @@ fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr) fetch_inferior_registers (I0_REGNUM); #endif } - + /* Register that we are able to handle lynx core file formats. FIXME: is this really bfd_target_unknown_flavour? */ static struct core_fns lynx_core_fns = { - bfd_target_unknown_flavour, - fetch_core_registers, - NULL + bfd_target_unknown_flavour, /* core_flavour */ + default_check_format, /* check_format */ + default_core_sniffer, /* core_sniffer */ + fetch_core_registers, /* core_read_registers */ + NULL /* next */ }; void -_initialize_core_lynx () +_initialize_core_lynx (void) { add_core_fns (&lynx_core_fns); }