diff options
author | Joel Brobecker <brobecker@gnat.com> | 2004-11-13 23:40:01 +0000 |
---|---|---|
committer | Joel Brobecker <brobecker@gnat.com> | 2004-11-13 23:40:01 +0000 |
commit | d599d25781549d28ef49cf3087a0b53b5ab3abc5 (patch) | |
tree | 3892c1cfb947abf052021ace3a3a2f0c6989296d /gdb/irix5-nat.c | |
parent | e6f6dfcda9a99079a83f3cd7232350584cf26d98 (diff) | |
download | gdb-d599d25781549d28ef49cf3087a0b53b5ab3abc5.tar.gz |
* irix5-nat.c (fill_gregset): Replace use of deprecated_registers
with equivalent code.
(fill_fpregset): Likewise.
Diffstat (limited to 'gdb/irix5-nat.c')
-rw-r--r-- | gdb/irix5-nat.c | 47 |
1 files changed, 29 insertions, 18 deletions
diff --git a/gdb/irix5-nat.c b/gdb/irix5-nat.c index 182a05a8a8e..9948d4abe12 100644 --- a/gdb/irix5-nat.c +++ b/gdb/irix5-nat.c @@ -83,6 +83,7 @@ fill_gregset (gregset_t *gregsetp, int regno) { int regi; greg_t *regp = &(*gregsetp)[0]; + LONGEST regval; /* Under Irix6, if GDB is built with N32 ABI and is debugging an O32 executable, we have to sign extend the registers to 64 bits before @@ -90,30 +91,39 @@ fill_gregset (gregset_t *gregsetp, int regno) for (regi = 0; regi <= CTX_RA; regi++) if ((regno == -1) || (regno == regi)) - *(regp + regi) = - extract_signed_integer (&deprecated_registers[DEPRECATED_REGISTER_BYTE (regi)], - register_size (current_gdbarch, regi)); + { + regcache_raw_read_signed (current_regcache, regi, ®val); + *(regp + regi) = regval; + } if ((regno == -1) || (regno == PC_REGNUM)) - *(regp + CTX_EPC) = - extract_signed_integer (&deprecated_registers[DEPRECATED_REGISTER_BYTE (mips_regnum (current_gdbarch)->pc)], - register_size (current_gdbarch, mips_regnum (current_gdbarch)->pc)); + { + regcache_raw_read_signed + (current_regcache, mips_regnum (current_gdbarch)->pc, ®val); + *(regp + CTX_EPC) = regval; + } if ((regno == -1) || (regno == mips_regnum (current_gdbarch)->cause)) - *(regp + CTX_CAUSE) = - extract_signed_integer (&deprecated_registers[DEPRECATED_REGISTER_BYTE (mips_regnum (current_gdbarch)->cause)], - register_size (current_gdbarch, mips_regnum (current_gdbarch)->cause)); + { + regcache_raw_read_signed + (current_regcache, mips_regnum (current_gdbarch)->cause, ®val); + *(regp + CTX_CAUSE) = regval; + } if ((regno == -1) || (regno == mips_regnum (current_gdbarch)->hi)) - *(regp + CTX_MDHI) = - extract_signed_integer (&deprecated_registers[DEPRECATED_REGISTER_BYTE (mips_regnum (current_gdbarch)->hi)], - register_size (current_gdbarch, mips_regnum (current_gdbarch)->hi)); + { + regcache_raw_read_signed + (current_regcache, mips_regnum (current_gdbarch)->hi, ®val); + *(regp + CTX_MDHI) = regval; + } if ((regno == -1) || (regno == mips_regnum (current_gdbarch)->lo)) - *(regp + CTX_MDLO) = - extract_signed_integer (&deprecated_registers[DEPRECATED_REGISTER_BYTE (mips_regnum (current_gdbarch)->lo)], - register_size (current_gdbarch, mips_regnum (current_gdbarch)->lo)); + { + regcache_raw_read_signed + (current_regcache, mips_regnum (current_gdbarch)->lo, ®val); + *(regp + CTX_MDLO) = regval; + } } /* @@ -158,15 +168,16 @@ fill_fpregset (fpregset_t *fpregsetp, int regno) { if ((regno == -1) || (regno == regi)) { - from = (char *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (regi)]; to = (char *) &(fpregsetp->fp_r.fp_regs[regi - FP0_REGNUM]); - memcpy (to, from, register_size (current_gdbarch, regi)); + regcache_raw_read (current_regcache, regi, to); } } if ((regno == -1) || (regno == mips_regnum (current_gdbarch)->fp_control_status)) - fpregsetp->fp_csr = *(unsigned *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (mips_regnum (current_gdbarch)->fp_control_status)]; + regcache_raw_read (current_regcache, + mips_regnum (current_gdbarch)->fp_control_status, + &fpregsetp->fp_csr); } |