|
From: <sv...@va...> - 2006-04-02 00:58:07
|
Author: sewardj
Date: 2006-04-02 01:58:01 +0100 (Sun, 02 Apr 2006)
New Revision: 5809
Log:
In check_all, allow two different acceptable byte values, so as to
cover the behaviour of all possible variants of float loads/stores.
Modified:
trunk/memcheck/tests/sh-mem.c
Modified: trunk/memcheck/tests/sh-mem.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/memcheck/tests/sh-mem.c 2006-04-01 23:06:29 UTC (rev 5808)
+++ trunk/memcheck/tests/sh-mem.c 2006-04-02 00:58:01 UTC (rev 5809)
@@ -61,20 +61,23 @@
return res;
}
=20
-// Check that all the bytes in a[x..y-1] have their V byte equal to 'byt=
e'.
+// Check that all the bytes in a[x..y-1] have their V byte equal=20
+// to either 'expected_byte' or 'expected_byte_alt'.
// 'str' and 'offset' are only used for printing an error message if
// something goes wrong.
-void check_all(U4 x, U4 y, U1 expected_byte, char* str, int offset)
+void check_all(U4 x, U4 y, U1 expected_byte, U1 expected_byte_alt,=20
+ char* str, int offset)
{
U1 sh[SZB_OF_a]; // Used for getting a[]'s V bits
int i;
=20
VALGRIND_GET_VBITS(a, sh, sizeof(a));
for (i =3D x; i < y; i++) {
- if ( expected_byte !=3D sh[i] ) {
+ if ( expected_byte !=3D sh[i] && expected_byte_alt !=3D sh[i] ) {
fprintf(stderr, "\n\nFAILURE: %s, offset %d, byte %d -- "
- "is 0x%x, should be 0x%x\n\n",
- str, offset, i, sh[i], expected_byte);
+ "is 0x%x, should be 0x%x or 0x%x\n\n",
+ str, offset, i, sh[i], expected_byte,=20
+ expected_byte_alt);
exit(1);
}
}
@@ -83,7 +86,7 @@
int main(void)
{
int h, i, j;
- U1 *undefA, expected_byte;
+ U1 *undefA, expected_byte, expected_byte_alt;
=20
if (0 =3D=3D RUNNING_ON_VALGRIND) {
fprintf(stderr, "error: this program only works when run under Val=
grind\n");
@@ -165,24 +168,33 @@
if (0 =3D=3D j % 32) fprintf(stderr, "%d...", j); /* progress m=
eter */ \
\
\
- /* A nasty exception: all machines so far (x86/AMD64/PPC32/PPC6=
4)
+ /* A nasty exception: most machines so far (x86/PPC32/PPC64)
* don't have 32-bit floats. So 32-bit floats get cast to 64-b=
it
* floats. Memcheck does a PCast in this case, which means tha=
t if
* any V bits for the 32-bit float are undefined (ie. 0 !=3D j)=
, all
* the V bits in the 64-bit float are undefined. So account fo=
r
- * this when checking. */ \
- expected_byte =3D ( (isF4 && 0 !=3D j) ? 0xff : j ); \
+ * this when checking. AMD64 typically does FP arithmetic on
+ * SSE, effectively giving it access to 32-bit FP registers. S=
o
+ * in short, for floats, we have to allow either 'j' or 0xFF
+ * as an acceptable result. Sigh. */ \
+ if (isF4) { \
+ expected_byte =3D j; \
+ expected_byte_alt =3D 0 !=3D j ? 0xFF : j; \
+ } else { \
+ expected_byte =3D j; \
+ expected_byte_alt =3D j; \
+ } \
\
/* STOREVn. Note that we use the first element of the undefN_T=
y
* array, as explained above. */ \
for (i =3D 0; i < nN-1; i++) { aNb[i] =3D undefN_Ty[0]; } \
- check_all(h, n-NNN+h, expected_byte, "STOREVn", h); \
- \
+ check_all(h, n-NNN+h, expected_byte, expected_byte_alt, "STOREV=
n", h); \
+ \
/* LOADVn -- by copying the values to one place and then back,=20
* we ensure that LOADVn gets exercised. */ \
for (i =3D 0; i < nN-1; i++) { bNb[i] =3D aNb[i]; } \
for (i =3D 0; i < nN-1; i++) { aNb[i] =3D bNb[i]; } \
- check_all(h, n-NNN+h, expected_byte, "LOADVn", h); \
+ check_all(h, n-NNN+h, expected_byte, expected_byte_alt, "LOADVn=
", h); \
} \
fprintf(stderr, "\n"); \
}
|