|
From: <sv...@va...> - 2016-10-17 19:19:33
|
Author: sewardj
Date: Mon Oct 17 20:19:26 2016
New Revision: 16059
Log:
Merge from trunk:
16037 Fix for missing ISA changes in HW cap stuff needs updating patch
Modified:
branches/VALGRIND_3_12_BRANCH/ (props changed)
branches/VALGRIND_3_12_BRANCH/memcheck/tests/vbit-test/irops.c
branches/VALGRIND_3_12_BRANCH/tests/min_power_isa.c
Modified: branches/VALGRIND_3_12_BRANCH/memcheck/tests/vbit-test/irops.c
==============================================================================
--- branches/VALGRIND_3_12_BRANCH/memcheck/tests/vbit-test/irops.c (original)
+++ branches/VALGRIND_3_12_BRANCH/memcheck/tests/vbit-test/irops.c Mon Oct 17 20:19:26 2016
@@ -1287,8 +1287,8 @@
case Iop_MulI128by10Carry:
case Iop_MulI128by10E:
case Iop_MulI128by10ECarry: {
- /* IROps require a processor that supports ISA 2.07 (Power 8) or newer */
- rc = system(MIN_POWER_ISA " 3.0 ");
+ /* IROps require a processor that supports ISA 3.00 (Power 9) or newer */
+ rc = system(MIN_POWER_ISA " 3.00 ");
rc /= 256;
/* MIN_POWER_ISA returns 0 if underlying HW supports the
* specified ISA or newer. Returns 1 if the HW does not support
Modified: branches/VALGRIND_3_12_BRANCH/tests/min_power_isa.c
==============================================================================
--- branches/VALGRIND_3_12_BRANCH/tests/min_power_isa.c (original)
+++ branches/VALGRIND_3_12_BRANCH/tests/min_power_isa.c Mon Oct 17 20:19:26 2016
@@ -64,7 +64,7 @@
return !(isa_level >= 8);
} else {
- fprintf(stderr, "ERROR: invalid ISA version. Valid versions numbers are:\n" );
+ fprintf(stderr, "ERROR: invalid ISA version '%s'. Valid versions numbers are:\n", min_isa);
fprintf(stderr, " 2.05, 2.06, 2.07, 3.00\n" );
exit(2);
}
|