From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6316 invoked by alias); 29 Apr 2004 06:12:09 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 6275 invoked from network); 29 Apr 2004 06:12:06 -0000 Received: from unknown (HELO pippin.tausq.org) (64.81.244.94) by sources.redhat.com with SMTP; 29 Apr 2004 06:12:06 -0000 Received: by pippin.tausq.org (Postfix, from userid 1000) id 78B04CD28A; Wed, 28 Apr 2004 23:12:07 -0700 (PDT) Date: Thu, 29 Apr 2004 06:12:00 -0000 From: Randolph Chung To: gdb-patches@sources.redhat.com Subject: [patch] Fix a few bugs in hppa-linux-nat Message-ID: <20040429061207.GW3965@tausq.org> Reply-To: Randolph Chung Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-GPG: for GPG key, see http://www.tausq.org/gpg.txt User-Agent: Mutt/1.5.5.1+cvs20040105i X-SW-Source: 2004-04/txt/msg00661.txt.bz2 These have been sitting in my system for a few days... when i submitted the hppa-linux-nat code initially these weren't quite working. Finally managed to track down the bugs. Ok to commit? Fixes thread_db handling and some corefile stuff. thanks, randolph 2004-04-28 Randolph Chung * hppa-linux-nat.c (fetch_register, store_register): Define. (fetch_inferior_registers, store_inferior_registers): Define. (supply_gregset): Add comment and clean up some unneeded code. (fill_gregset): Add comment and fix so that it saves registers in the right place in the gregset. (fill_fpregset): Fix buffer overrun problem. * config/pa/nm-linux.h (FETCH_INFERIOR_REGISTERS): Define. Index: hppa-linux-nat.c =================================================================== RCS file: /cvs/src/src/gdb/hppa-linux-nat.c,v retrieving revision 1.1 diff -u -p -r1.1 hppa-linux-nat.c --- hppa-linux-nat.c 29 Apr 2004 03:36:49 -0000 1.1 +++ hppa-linux-nat.c 29 Apr 2004 05:49:59 -0000 @@ -22,8 +22,10 @@ #include "gdbcore.h" #include "regcache.h" #include "gdb_string.h" +#include "inferior.h" #include +#include #include #include @@ -199,6 +201,99 @@ static const int greg_map[] = CCR_REGNUM, EIEM_REGNUM, }; + + +/* Fetch one register. */ + +static void +fetch_register (int regno) +{ + int tid; + int val; + + if (CANNOT_FETCH_REGISTER (regno)) + { + supply_register (regno, NULL); + return; + } + + /* GNU/Linux LWP ID's are process ID's. */ + tid = TIDGET (inferior_ptid); + if (tid == 0) + tid = PIDGET (inferior_ptid); /* Not a threaded program. */ + + errno = 0; + val = ptrace (PTRACE_PEEKUSER, tid, register_addr (regno, 0), 0); + if (errno != 0) + error ("Couldn't read register %s (#%d): %s.", REGISTER_NAME (regno), + regno, safe_strerror (errno)); + + supply_register (regno, &val); +} + +/* Store one register. */ + +static void +store_register (int regno) +{ + int tid; + int val; + + if (CANNOT_STORE_REGISTER (regno)) + return; + + /* GNU/Linux LWP ID's are process ID's. */ + tid = TIDGET (inferior_ptid); + if (tid == 0) + tid = PIDGET (inferior_ptid); /* Not a threaded program. */ + + errno = 0; + regcache_collect (regno, &val); + ptrace (PTRACE_POKEUSER, tid, register_addr (regno, 0), val); + if (errno != 0) + error ("Couldn't write register %s (#%d): %s.", REGISTER_NAME (regno), + regno, safe_strerror (errno)); +} + +/* Fetch registers from the child process. Fetch all registers if + regno == -1, otherwise fetch all general registers or all floating + point registers depending upon the value of regno. */ + +void +fetch_inferior_registers (int regno) +{ + if (-1 == regno) + { + for (regno = 0; regno < NUM_REGS; regno++) + fetch_register (regno); + } + else + { + fetch_register (regno); + } +} + +/* Store registers back into the inferior. Store all registers if + regno == -1, otherwise store all general registers or all floating + point registers depending upon the value of regno. */ + +void +store_inferior_registers (int regno) +{ + if (-1 == regno) + { + for (regno = 0; regno < NUM_REGS; regno++) + store_register (regno); + } + else + { + store_register (regno); + } +} + +/* Fill GDB's register array with the general-purpose register values + in *gregsetp. */ + void supply_gregset (gdb_gregset_t *gregsetp) { @@ -208,28 +303,26 @@ supply_gregset (gdb_gregset_t *gregsetp) for (i = 0; i < sizeof (greg_map) / sizeof (greg_map[0]); i++, regp++) { int regno = greg_map[i]; - int size = register_size (current_gdbarch, regno); - /* When running a 64 bit kernel, a greg_t may be larger than the - actual register, so just pick off the LS bits of big-endian word. */ - supply_register (regno, ((char *) (regp + 1)) - size); + supply_register (regno, regp); } } +/* Fill register regno (if it is a general-purpose register) in + *gregsetp with the appropriate value from GDB's register array. + If regno is -1, do this for all registers. */ + void fill_gregset (gdb_gregset_t *gregsetp, int regno) { int i; - greg_t *regp = (greg_t *) gregsetp; - memset (gregsetp, 0, sizeof (*gregsetp)); - for (i = 0; i < sizeof (greg_map) / sizeof (greg_map[0]); i++, regp++) + for (i = 0; i < sizeof (greg_map) / sizeof (greg_map[0]); i++) { - int regi = greg_map[i]; + int mregno = greg_map[i]; - if (regno == -1 || regi == regno) + if (regno == -1 || regno == mregno) { - int rawsize = register_size (current_gdbarch, regi); - regcache_collect (regi, ((char *) (regp + 1)) - rawsize); + regcache_collect(mregno, &(*gregsetp)[i]); } } } @@ -262,16 +355,13 @@ fill_fpregset (gdb_fpregset_t *fpregsetp { int i; - for (i = 0; i < NUM_REGS; i++) + for (i = HPPA_FP0_REGNUM; i < HPPA_FP0_REGNUM + 32 * 2; i++) { - if (regno == -1 || regno == i) - { - /* Gross. fpregset_t is double, registers[x] has single - precision reg. */ - char *to = (char *) &((*fpregsetp)[(i - HPPA_FP0_REGNUM) / 2]); - if ((i - HPPA_FP0_REGNUM) & 1) - to += 4; - regcache_collect (i, to); - } + /* Gross. fpregset_t is double, registers[x] has single + precision reg. */ + char *to = (char *) &((*fpregsetp)[(i - HPPA_FP0_REGNUM) / 2]); + if ((i - HPPA_FP0_REGNUM) & 1) + to += 4; + regcache_collect (i, to); } } Index: config/pa/nm-linux.h =================================================================== RCS file: /cvs/src/src/gdb/config/pa/nm-linux.h,v retrieving revision 1.1 diff -u -p -r1.1 nm-linux.h --- config/pa/nm-linux.h 29 Apr 2004 03:36:50 -0000 1.1 +++ config/pa/nm-linux.h 29 Apr 2004 05:50:01 -0000 @@ -25,5 +25,8 @@ #define U_REGS_OFFSET 0 +/* Override copies of {fetch,store}_inferior_registers in `infptrace.c'. */ +#define FETCH_INFERIOR_REGISTERS + #endif -- Randolph Chung Debian GNU/Linux Developer, hppa/ia64 ports http://www.tausq.org/