diff options
| -rw-r--r-- | gnu/usr.bin/gdb/gdb/arch/i386/i386b-nat.c | 29 | ||||
| -rw-r--r-- | gnu/usr.bin/gdb/gdb/arch/i386/nm.h | 8 | ||||
| -rw-r--r-- | gnu/usr.bin/gdb/gdb/arch/i386/tm.h | 6 |
3 files changed, 15 insertions, 28 deletions
diff --git a/gnu/usr.bin/gdb/gdb/arch/i386/i386b-nat.c b/gnu/usr.bin/gdb/gdb/arch/i386/i386b-nat.c index 68a3e55d874..4a553f6c6fa 100644 --- a/gnu/usr.bin/gdb/gdb/arch/i386/i386b-nat.c +++ b/gnu/usr.bin/gdb/gdb/arch/i386/i386b-nat.c @@ -17,7 +17,7 @@ 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. - $Id: i386b-nat.c,v 1.2 1995/11/20 09:21:12 deraadt Exp $ + $Id: i386b-nat.c,v 1.3 1995/11/23 15:56:20 deraadt Exp $ */ #include <sys/types.h> @@ -31,9 +31,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #include "defs.h" #include "inferior.h" -int tregmap[] = {tEAX, tECX, tEDX, tEBX, tESP, tEBP, tESI, tEDI, - tEIP, tEFLAGS, tCS, tSS, tDS, tES}; - void fetch_inferior_registers (regno) int regno; @@ -43,7 +40,7 @@ fetch_inferior_registers (regno) ptrace (PT_GETREGS, inferior_pid, (PTRACE_ARG3_TYPE) &inferior_registers, 0); - memcpy (®isters[REGISTER_BYTE (0)], &inferior_registers, NUM_REGS * 4); + memcpy (®isters[REGISTER_BYTE (0)], &inferior_registers, 4*NUM_REGS); registers_fetched (); } @@ -54,7 +51,7 @@ store_inferior_registers (regno) { struct reg inferior_registers; - memcpy (&inferior_registers, ®isters[REGISTER_BYTE (0)], NUM_REGS * 4); + memcpy (&inferior_registers, ®isters[REGISTER_BYTE (0)], 4*NUM_REGS); ptrace (PT_SETREGS, inferior_pid, (PTRACE_ARG3_TYPE) &inferior_registers, 0); @@ -349,20 +346,20 @@ fetch_kcore_registers(pcb) if (target_read_memory(pcb->pcb_tss.tss_esp+4, regs, sizeof regs, 0)) error("Cannot read ebx, esi, and edi."); for (i = 0, regno = 0; regno < 3; regno++) - supply_register(regno, &i); - supply_register(3, ®s[2]); - supply_register(4, &pcb->pcb_tss.tss_esp); - supply_register(5, &pcb->pcb_tss.tss_ebp); - supply_register(6, ®s[1]); - supply_register(7, ®s[0]); - supply_register(8, ®s[3]); + supply_register(regno, (char *)&i); + supply_register(3, (char *)®s[2]); + supply_register(4, (char *)&pcb->pcb_tss.tss_esp); + supply_register(5, (char *)&pcb->pcb_tss.tss_ebp); + supply_register(6, (char *)®s[1]); + supply_register(7, (char *)®s[0]); + supply_register(8, (char *)®s[3]); for (i = 0, regno = 9; regno < 10; regno++) - supply_register(regno, &i); + supply_register(regno, (char *)&i); #if 0 i = 0x08; - supply_register(10, &i); + supply_register(10, (char *)&i); i = 0x10; - supply_register(11, &i); + supply_register(11, (char *)&i); #endif /* XXX 80387 registers? */ } diff --git a/gnu/usr.bin/gdb/gdb/arch/i386/nm.h b/gnu/usr.bin/gdb/gdb/arch/i386/nm.h index f86cd07ffe7..a30ae014c73 100644 --- a/gnu/usr.bin/gdb/gdb/arch/i386/nm.h +++ b/gnu/usr.bin/gdb/gdb/arch/i386/nm.h @@ -17,7 +17,7 @@ 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. - $Id: nm.h,v 1.1 1995/10/18 08:40:06 deraadt Exp $ + $Id: nm.h,v 1.2 1995/11/23 15:56:21 deraadt Exp $ */ #ifndef NM_I386BSD_H @@ -37,10 +37,4 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. to get the offset in the core file of the register values. */ #define KERNEL_U_ADDR USRSTACK -#define REGISTER_U_ADDR(addr, blockend, regno) \ -{ \ - extern int tregmap[]; \ - addr = blockend + 4 * tregmap[regno]; \ -} - #endif /* NM_I386BSD_H */ diff --git a/gnu/usr.bin/gdb/gdb/arch/i386/tm.h b/gnu/usr.bin/gdb/gdb/arch/i386/tm.h index ac78de083f5..dba13496319 100644 --- a/gnu/usr.bin/gdb/gdb/arch/i386/tm.h +++ b/gnu/usr.bin/gdb/gdb/arch/i386/tm.h @@ -17,7 +17,7 @@ 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. - $Id: tm.h,v 1.1 1995/10/18 08:40:06 deraadt Exp $ + $Id: tm.h,v 1.2 1995/11/23 15:56:22 deraadt Exp $ */ /* Override number of expected traps from sysv. */ @@ -29,10 +29,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. /* Shared library code */ #include "solib.h" -/* We can't yet read %fs and %gs. */ -#undef NUM_REGS -#define NUM_REGS 14 - /* We define our own fetch and store methods. */ #define FETCH_INFERIOR_REGISTERS |