commit b176a6fe01b12f6a36e70c2d33454baaf50ad1e8
author dejanj <dejanj@8f6e269a-dfd6-0310-a8e1-e2731360e62c> Mon Mar 03 14:13:37 2014 +0000
committer dejanj <dejanj@8f6e269a-dfd6-0310-a8e1-e2731360e62c> Mon Mar 03 14:13:37 2014 +0000
tree f99287a74d05153585f863483eb5c67fdbc5a8cb
parent 5ba41309fde9d8eaccd95511e0d21de399cd70c6

mips32: Fix the problem with reading the guest_FCSR register from the wrong guest state.

When Valgrind isn't executed in mode64, register fcsr need to read from the VexGuestMIPS32State.


git-svn-id: svn://svn.valgrind.org/vex/trunk@2832 8f6e269a-dfd6-0310-a8e1-e2731360e62c

priv/guest_mips_toIR.c

diff --git a/priv/guest_mips_toIR.c b/priv/guest_mips_toIR.c
index d95d583..51e7cfc 100644
--- a/priv/guest_mips_toIR.c
+++ b/priv/guest_mips_toIR.c
@@ -1140,7 +1140,10 @@
       vex_bzero(&d->fxState, sizeof(d->fxState));
 
       d->fxState[0].fx     = Ifx_Read;  /* read */
-      d->fxState[0].offset = offsetof(VexGuestMIPS64State, guest_FCSR);
+      if (mode64)
+         d->fxState[0].offset = offsetof(VexGuestMIPS64State, guest_FCSR);
+      else
+         d->fxState[0].offset = offsetof(VexGuestMIPS32State, guest_FCSR);
       d->fxState[0].size   = sizeof(UInt);
       d->fxState[1].fx     = Ifx_Read;  /* read */
       d->fxState[1].offset = floatGuestRegOffset(fs);
@@ -1160,7 +1163,10 @@
       vex_bzero(&d->fxState, sizeof(d->fxState));
 
       d->fxState[0].fx     = Ifx_Read;  /* read */
-      d->fxState[0].offset = offsetof(VexGuestMIPS64State, guest_FCSR);
+      if (mode64)
+         d->fxState[0].offset = offsetof(VexGuestMIPS64State, guest_FCSR);
+      else
+         d->fxState[0].offset = offsetof(VexGuestMIPS32State, guest_FCSR);
       d->fxState[0].size   = sizeof(UInt);
       d->fxState[1].fx     = Ifx_Read;  /* read */
       d->fxState[1].offset = floatGuestRegOffset(fs);