82 lines
3.2 KiB
Diff
82 lines
3.2 KiB
Diff
commit 7f1dd9d5aec1f1fd4eb0ae3a311358a914f1d73f
|
|
Author: Julian Seward <jseward@acm.org>
|
|
Date: Tue Nov 20 10:18:29 2018 +0100
|
|
|
|
get_otrack_shadow_offset_wrk for ppc32 and ppc64: add missing cases for XER_OV32, XER_CA32 and C_FPCC.
|
|
|
|
The missing cases were discovered whilst testing fixes for bug 386945, but are
|
|
otherwise unrelated to that bug.
|
|
|
|
diff --git a/memcheck/mc_machine.c b/memcheck/mc_machine.c
|
|
index 5ed101f..4ce746e 100644
|
|
--- a/memcheck/mc_machine.c
|
|
+++ b/memcheck/mc_machine.c
|
|
@@ -120,11 +120,11 @@ static Int get_otrack_shadow_offset_wrk ( Int offset, Int szB )
|
|
Int o = offset;
|
|
tl_assert(sz > 0);
|
|
|
|
-#if defined(VGA_ppc64be)
|
|
+# if defined(VGA_ppc64be)
|
|
tl_assert(host_is_big_endian());
|
|
-#elif defined(VGA_ppc64le)
|
|
+# elif defined(VGA_ppc64le)
|
|
tl_assert(host_is_little_endian());
|
|
-#endif
|
|
+# endif
|
|
|
|
if (sz == 8 || sz == 4) {
|
|
/* The point of this is to achieve
|
|
@@ -132,11 +132,11 @@ static Int get_otrack_shadow_offset_wrk ( Int offset, Int szB )
|
|
return GOF(GPRn);
|
|
by testing ox instead of o, and setting ox back 4 bytes when sz == 4.
|
|
*/
|
|
-#if defined(VGA_ppc64le)
|
|
+# if defined(VGA_ppc64le)
|
|
Int ox = o;
|
|
-#else
|
|
+# else
|
|
Int ox = sz == 8 ? o : (o - 4);
|
|
-#endif
|
|
+# endif
|
|
if (ox == GOF(GPR0)) return ox;
|
|
if (ox == GOF(GPR1)) return ox;
|
|
if (ox == GOF(GPR2)) return ox;
|
|
@@ -240,11 +240,13 @@ static Int get_otrack_shadow_offset_wrk ( Int offset, Int szB )
|
|
if (o == GOF(VSR31) && sz == 8) return o;
|
|
|
|
/* For the various byte sized XER/CR pieces, use offset 8
|
|
- in VSR0 .. VSR19. */
|
|
+ in VSR0 .. VSR21. */
|
|
tl_assert(SZB(VSR0) == 16);
|
|
if (o == GOF(XER_SO) && sz == 1) return 8 +GOF(VSR0);
|
|
if (o == GOF(XER_OV) && sz == 1) return 8 +GOF(VSR1);
|
|
+ if (o == GOF(XER_OV32) && sz == 1) return 8 +GOF(VSR20);
|
|
if (o == GOF(XER_CA) && sz == 1) return 8 +GOF(VSR2);
|
|
+ if (o == GOF(XER_CA32) && sz == 1) return 8 +GOF(VSR21);
|
|
if (o == GOF(XER_BC) && sz == 1) return 8 +GOF(VSR3);
|
|
|
|
if (o == GOF(CR0_321) && sz == 1) return 8 +GOF(VSR4);
|
|
@@ -388,6 +390,7 @@ static Int get_otrack_shadow_offset_wrk ( Int offset, Int szB )
|
|
if (o == GOF(IP_AT_SYSCALL) && sz == 4) return -1; /* slot unused */
|
|
if (o == GOF(FPROUND) && sz == 1) return -1;
|
|
if (o == GOF(DFPROUND) && sz == 1) return -1;
|
|
+ if (o == GOF(C_FPCC) && sz == 1) return -1;
|
|
if (o == GOF(VRSAVE) && sz == 4) return -1;
|
|
if (o == GOF(EMNOTE) && sz == 4) return -1;
|
|
if (o == GOF(CMSTART) && sz == 4) return -1;
|
|
@@ -440,11 +443,13 @@ static Int get_otrack_shadow_offset_wrk ( Int offset, Int szB )
|
|
if (o == GOF(VSR31) && sz == 8) return o;
|
|
|
|
/* For the various byte sized XER/CR pieces, use offset 8
|
|
- in VSR0 .. VSR19. */
|
|
+ in VSR0 .. VSR21. */
|
|
tl_assert(SZB(VSR0) == 16);
|
|
if (o == GOF(XER_SO) && sz == 1) return 8 +GOF(VSR0);
|
|
if (o == GOF(XER_OV) && sz == 1) return 8 +GOF(VSR1);
|
|
+ if (o == GOF(XER_OV32) && sz == 1) return 8 +GOF(VSR20);
|
|
if (o == GOF(XER_CA) && sz == 1) return 8 +GOF(VSR2);
|
|
+ if (o == GOF(XER_CA32) && sz == 1) return 8 +GOF(VSR21);
|
|
if (o == GOF(XER_BC) && sz == 1) return 8 +GOF(VSR3);
|
|
|
|
if (o == GOF(CR0_321) && sz == 1) return 8 +GOF(VSR4);
|