From 637f7d589ae8d57e1996dcc93167ded09aaea56d Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Thu, 10 May 2007 21:36:00 +0000 Subject: * inf-ptrace.c (inf_ptrace_register_u_offset): Adapt parameter list. (inf_ptrace_fetch_register): Add register_u_offset callback parameters GDBARCH and STORE_P. Handle callback (CORE_ADDR) -1 return value. (inf_ptrace_store_register): Likewise. (inf_ptrace_trad_target): Adapt register_u_offset parameter list. * inf-ptrace.h (inf_ptrace_trad_target): Likewise. * vax-nat.c (vax_register_u_offset): Adapt parameter list. * linux-nat.c (linux_trad_target): Adapt parameter list. * linux-nat.h (linux_trad_target): Likewise. * alpha-linux-nat.c (alpha_linux_register_u_offset): Adapt parameters. * mips-linux-nat.c (mips_linux_cannot_fetch_register): Remove. (mips_linux_cannot_store_register): Likewise. (mips_linux_register_addr): Add GDBARCH and STORE_P parameters. Return (CORE_ADDR) -1 for registers that cannot be fetched or stored via ptrace. Use GDBARCH instead of current_gdbarch. (mips64_linux_register_addr): Likewise. (mips_linux_register_u_offset): Adapt parameter list. Pass GDBARCH and STORE_P on to mips{64}_linux_register_addr. * config/mips/linux.mh (NAT_FILE): Set to config/nm-linux.h. * config/mips/nm-linux.h: Delete file. --- gdb/mips-linux-nat.c | 121 ++++++++++++++++++--------------------------------- 1 file changed, 42 insertions(+), 79 deletions(-) (limited to 'gdb/mips-linux-nat.c') diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c index a511689f1ce..6b961ac9b10 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -47,112 +47,75 @@ static int have_ptrace_regsets = 1; void (*super_fetch_registers) (struct regcache *, int); void (*super_store_registers) (struct regcache *, int); -/* Pseudo registers can not be read. ptrace does not provide a way to - read (or set) MIPS_PS_REGNUM, and there's no point in reading or - setting MIPS_ZERO_REGNUM. We also can not set BADVADDR, CAUSE, or - FCRIR via ptrace(). */ - -int -mips_linux_cannot_fetch_register (int regno) -{ - if (regno > MIPS_ZERO_REGNUM && regno < MIPS_ZERO_REGNUM + 32) - return 0; - else if (regno >= mips_regnum (current_gdbarch)->fp0 - && regno <= mips_regnum (current_gdbarch)->fp0 + 32) - return 0; - else if (regno == mips_regnum (current_gdbarch)->lo - || regno == mips_regnum (current_gdbarch)->hi - || regno == mips_regnum (current_gdbarch)->badvaddr - || regno == mips_regnum (current_gdbarch)->cause - || regno == mips_regnum (current_gdbarch)->pc - || regno == mips_regnum (current_gdbarch)->fp_control_status - || regno == mips_regnum (current_gdbarch)->fp_implementation_revision) - return 0; - else - return 1; -} - -int -mips_linux_cannot_store_register (int regno) -{ - if (regno > MIPS_ZERO_REGNUM && regno < MIPS_ZERO_REGNUM + 32) - return 0; - else if (regno >= FP0_REGNUM && regno <= FP0_REGNUM + 32) - return 0; - else if (regno == mips_regnum (current_gdbarch)->lo - || regno == mips_regnum (current_gdbarch)->hi - || regno == mips_regnum (current_gdbarch)->pc - || regno == mips_regnum (current_gdbarch)->fp_control_status) - return 0; - else - return 1; -} - /* Map gdb internal register number to ptrace ``address''. - These ``addresses'' are normally defined in . */ + These ``addresses'' are normally defined in . + + ptrace does not provide a way to read (or set) MIPS_PS_REGNUM, + and there's no point in reading or setting MIPS_ZERO_REGNUM. + We also can not set BADVADDR, CAUSE, or FCRIR via ptrace(). */ static CORE_ADDR -mips_linux_register_addr (int regno) +mips_linux_register_addr (struct gdbarch *gdbarch, int regno, int store) { - int regaddr; + CORE_ADDR regaddr; if (regno < 0 || regno >= NUM_REGS) error (_("Bogon register number %d."), regno); - if (regno < 32) + if (regno > MIPS_ZERO_REGNUM && regno < MIPS_ZERO_REGNUM + 32) regaddr = regno; - else if ((regno >= mips_regnum (current_gdbarch)->fp0) - && (regno < mips_regnum (current_gdbarch)->fp0 + 32)) - regaddr = FPR_BASE + (regno - mips_regnum (current_gdbarch)->fp0); - else if (regno == mips_regnum (current_gdbarch)->pc) + else if ((regno >= mips_regnum (gdbarch)->fp0) + && (regno < mips_regnum (gdbarch)->fp0 + 32)) + regaddr = FPR_BASE + (regno - mips_regnum (gdbarch)->fp0); + else if (regno == mips_regnum (gdbarch)->pc) regaddr = PC; - else if (regno == mips_regnum (current_gdbarch)->cause) - regaddr = CAUSE; - else if (regno == mips_regnum (current_gdbarch)->badvaddr) - regaddr = BADVADDR; - else if (regno == mips_regnum (current_gdbarch)->lo) + else if (regno == mips_regnum (gdbarch)->cause) + regaddr = store? (CORE_ADDR) -1 : CAUSE; + else if (regno == mips_regnum (gdbarch)->badvaddr) + regaddr = store? (CORE_ADDR) -1 : BADVADDR; + else if (regno == mips_regnum (gdbarch)->lo) regaddr = MMLO; - else if (regno == mips_regnum (current_gdbarch)->hi) + else if (regno == mips_regnum (gdbarch)->hi) regaddr = MMHI; - else if (regno == mips_regnum (current_gdbarch)->fp_control_status) + else if (regno == mips_regnum (gdbarch)->fp_control_status) regaddr = FPC_CSR; - else if (regno == mips_regnum (current_gdbarch)->fp_implementation_revision) - regaddr = FPC_EIR; + else if (regno == mips_regnum (gdbarch)->fp_implementation_revision) + regaddr = store? (CORE_ADDR) -1 : FPC_EIR; else - error (_("Unknowable register number %d."), regno); + regaddr = (CORE_ADDR) -1; return regaddr; } static CORE_ADDR -mips64_linux_register_addr (int regno) +mips64_linux_register_addr (struct gdbarch *gdbarch, int regno, int store) { - int regaddr; + CORE_ADDR regaddr; if (regno < 0 || regno >= NUM_REGS) error (_("Bogon register number %d."), regno); - if (regno < 32) + if (regno > MIPS_ZERO_REGNUM && regno < MIPS_ZERO_REGNUM + 32) regaddr = regno; - else if ((regno >= mips_regnum (current_gdbarch)->fp0) - && (regno < mips_regnum (current_gdbarch)->fp0 + 32)) + else if ((regno >= mips_regnum (gdbarch)->fp0) + && (regno < mips_regnum (gdbarch)->fp0 + 32)) regaddr = MIPS64_FPR_BASE + (regno - FP0_REGNUM); - else if (regno == mips_regnum (current_gdbarch)->pc) + else if (regno == mips_regnum (gdbarch)->pc) regaddr = MIPS64_PC; - else if (regno == mips_regnum (current_gdbarch)->cause) - regaddr = MIPS64_CAUSE; - else if (regno == mips_regnum (current_gdbarch)->badvaddr) - regaddr = MIPS64_BADVADDR; - else if (regno == mips_regnum (current_gdbarch)->lo) + else if (regno == mips_regnum (gdbarch)->cause) + regaddr = store? (CORE_ADDR) -1 : MIPS64_CAUSE; + else if (regno == mips_regnum (gdbarch)->badvaddr) + regaddr = store? (CORE_ADDR) -1 : MIPS64_BADVADDR; + else if (regno == mips_regnum (gdbarch)->lo) regaddr = MIPS64_MMLO; - else if (regno == mips_regnum (current_gdbarch)->hi) + else if (regno == mips_regnum (gdbarch)->hi) regaddr = MIPS64_MMHI; - else if (regno == mips_regnum (current_gdbarch)->fp_control_status) + else if (regno == mips_regnum (gdbarch)->fp_control_status) regaddr = MIPS64_FPC_CSR; - else if (regno == mips_regnum (current_gdbarch)->fp_implementation_revision) - regaddr = MIPS64_FPC_EIR; + else if (regno == mips_regnum (gdbarch)->fp_implementation_revision) + regaddr = store? (CORE_ADDR) -1 : MIPS64_FPC_EIR; else - error (_("Unknowable register number %d."), regno); + regaddr = (CORE_ADDR) -1; return regaddr; } @@ -364,12 +327,12 @@ mips64_linux_store_registers (struct regcache *regcache, int regnum) REGNO. */ static CORE_ADDR -mips_linux_register_u_offset (int regno) +mips_linux_register_u_offset (struct gdbarch *gdbarch, int regno, int store_p) { - if (mips_abi_regsize (current_gdbarch) == 8) - return mips64_linux_register_addr (regno); + if (mips_abi_regsize (gdbarch) == 8) + return mips64_linux_register_addr (gdbarch, regno, store_p); else - return mips_linux_register_addr (regno); + return mips_linux_register_addr (gdbarch, regno, store_p); } void _initialize_mips_linux_nat (void); -- cgit v1.2.1