* i387-nat.c (i387_fill_fsave): Use regcache_collect.
(i387_fill_fxsave): Likewise.
This commit is contained in:
parent
b9a743c80b
commit
13e4998045
2 changed files with 20 additions and 10 deletions
|
@ -1,3 +1,8 @@
|
|||
2002-05-06 Mark Kettenis <kettenis@gnu.org>
|
||||
|
||||
* i387-nat.c (i387_fill_fsave): Use regcache_collect.
|
||||
(i387_fill_fxsave): Likewise.
|
||||
|
||||
2002-05-05 Alexandre Oliva <aoliva@redhat.com>
|
||||
|
||||
* alpha-tdep.c (alpha_extract_return_value): Don't use
|
||||
|
|
|
@ -116,23 +116,26 @@ i387_fill_fsave (char *fsave, int regnum)
|
|||
if (i >= FPC_REGNUM
|
||||
&& i != FIOFF_REGNUM && i != FOOFF_REGNUM)
|
||||
{
|
||||
char buf[4];
|
||||
|
||||
regcache_collect (i, buf);
|
||||
|
||||
if (i == FOP_REGNUM)
|
||||
{
|
||||
unsigned short oldval, newval;
|
||||
|
||||
/* The opcode occupies only 11 bits. */
|
||||
oldval = (*(unsigned short *) (FSAVE_ADDR (fsave, i)));
|
||||
newval = *(unsigned short *) ®isters[REGISTER_BYTE (i)];
|
||||
newval = *(unsigned short *) buf;
|
||||
newval &= ((1 << 11) - 1);
|
||||
newval |= oldval & ~((1 << 11) - 1);
|
||||
memcpy (FSAVE_ADDR (fsave, i), &newval, 2);
|
||||
}
|
||||
else
|
||||
memcpy (FSAVE_ADDR (fsave, i), ®isters[REGISTER_BYTE (i)], 2);
|
||||
memcpy (FSAVE_ADDR (fsave, i), buf, 2);
|
||||
}
|
||||
else
|
||||
memcpy (FSAVE_ADDR (fsave, i), ®isters[REGISTER_BYTE (i)],
|
||||
REGISTER_RAW_SIZE (i));
|
||||
regcache_collect (i, FSAVE_ADDR (fsave, i));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -255,13 +258,17 @@ i387_fill_fxsave (char *fxsave, int regnum)
|
|||
if (i >= FPC_REGNUM && i < XMM0_REGNUM
|
||||
&& i != FIOFF_REGNUM && i != FDOFF_REGNUM)
|
||||
{
|
||||
char buf[4];
|
||||
|
||||
regcache_collect (i, buf);
|
||||
|
||||
if (i == FOP_REGNUM)
|
||||
{
|
||||
unsigned short oldval, newval;
|
||||
|
||||
/* The opcode occupies only 11 bits. */
|
||||
oldval = (*(unsigned short *) (FXSAVE_ADDR (fxsave, i)));
|
||||
newval = *(unsigned short *) ®isters[REGISTER_BYTE (i)];
|
||||
newval = *(unsigned short *) buf;
|
||||
newval &= ((1 << 11) - 1);
|
||||
newval |= oldval & ~((1 << 11) - 1);
|
||||
memcpy (FXSAVE_ADDR (fxsave, i), &newval, 2);
|
||||
|
@ -274,7 +281,7 @@ i387_fill_fxsave (char *fxsave, int regnum)
|
|||
unsigned short ftag;
|
||||
int fpreg;
|
||||
|
||||
ftag = *(unsigned short *) ®isters[REGISTER_BYTE (i)];
|
||||
ftag = *(unsigned short *) buf;
|
||||
|
||||
for (fpreg = 7; fpreg >= 0; fpreg--)
|
||||
{
|
||||
|
@ -287,12 +294,10 @@ i387_fill_fxsave (char *fxsave, int regnum)
|
|||
memcpy (FXSAVE_ADDR (fxsave, i), &val, 2);
|
||||
}
|
||||
else
|
||||
memcpy (FXSAVE_ADDR (fxsave, i),
|
||||
®isters[REGISTER_BYTE (i)], 2);
|
||||
memcpy (FXSAVE_ADDR (fxsave, i), buf, 2);
|
||||
}
|
||||
else
|
||||
memcpy (FXSAVE_ADDR (fxsave, i), ®isters[REGISTER_BYTE (i)],
|
||||
REGISTER_RAW_SIZE (i));
|
||||
regcache_collect (i, FXSAVE_ADDR (fxsave, i));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue