Index: test/compiler-unittests/arm/instruction-selector-arm-unittest.cc |
diff --git a/test/compiler-unittests/arm/instruction-selector-arm-unittest.cc b/test/compiler-unittests/arm/instruction-selector-arm-unittest.cc |
index d8fbcf145d60e97d382f29c4079de8470560c18a..f3fa9c5e15a7e5318d0a9795b52059e18aa9154d 100644 |
--- a/test/compiler-unittests/arm/instruction-selector-arm-unittest.cc |
+++ b/test/compiler-unittests/arm/instruction-selector-arm-unittest.cc |
@@ -1197,6 +1197,8 @@ struct MemoryAccess { |
MachineType type; |
ArchOpcode ldr_opcode; |
ArchOpcode str_opcode; |
+ bool (InstructionSelectorTest::Stream::*val_predicate)( |
+ const InstructionOperand*) const; |
const int32_t immediates[40]; |
}; |
@@ -1212,36 +1214,49 @@ static const MemoryAccess kMemoryAccesses[] = { |
{kMachInt8, |
kArmLdrsb, |
kArmStrb, |
+ &InstructionSelectorTest::Stream::IsInteger, |
{-4095, -3340, -3231, -3224, -3088, -1758, -1203, -123, -117, -91, -89, |
-87, -86, -82, -44, -23, -3, 0, 7, 10, 39, 52, 69, 71, 91, 92, 107, 109, |
115, 124, 286, 655, 1362, 1569, 2587, 3067, 3096, 3462, 3510, 4095}}, |
{kMachUint8, |
kArmLdrb, |
kArmStrb, |
+ &InstructionSelectorTest::Stream::IsInteger, |
{-4095, -3914, -3536, -3234, -3185, -3169, -1073, -990, -859, -720, -434, |
-127, -124, -122, -105, -91, -86, -64, -55, -53, -30, -10, -3, 0, 20, 28, |
39, 58, 64, 73, 75, 100, 108, 121, 686, 963, 1363, 2759, 3449, 4095}}, |
{kMachInt16, |
kArmLdrsh, |
kArmStrh, |
+ &InstructionSelectorTest::Stream::IsInteger, |
{-255, -251, -232, -220, -144, -138, -130, -126, -116, -115, -102, -101, |
-98, -69, -59, -56, -39, -35, -23, -19, -7, 0, 22, 26, 37, 68, 83, 87, 98, |
102, 108, 111, 117, 171, 195, 203, 204, 245, 246, 255}}, |
{kMachUint16, |
kArmLdrh, |
kArmStrh, |
+ &InstructionSelectorTest::Stream::IsInteger, |
{-255, -230, -201, -172, -125, -119, -118, -105, -98, -79, -54, -42, -41, |
-32, -12, -11, -5, -4, 0, 5, 9, 25, 28, 51, 58, 60, 89, 104, 108, 109, |
114, 116, 120, 138, 150, 161, 166, 172, 228, 255}}, |
{kMachInt32, |
kArmLdr, |
kArmStr, |
+ &InstructionSelectorTest::Stream::IsInteger, |
{-4095, -1898, -1685, -1562, -1408, -1313, -344, -128, -116, -100, -92, |
-80, -72, -71, -56, -25, -21, -11, -9, 0, 3, 5, 27, 28, 42, 52, 63, 88, |
93, 97, 125, 846, 1037, 2102, 2403, 2597, 2632, 2997, 3935, 4095}}, |
+ {kMachFloat32, |
+ kArmVldr32, |
+ kArmVstr32, |
+ &InstructionSelectorTest::Stream::IsDouble, |
+ {-1020, -928, -896, -772, -728, -680, -660, -488, -372, -112, -100, -92, |
+ -84, -80, -72, -64, -60, -56, -52, -48, -36, -32, -20, -8, -4, 0, 8, 20, |
+ 24, 40, 64, 112, 204, 388, 516, 852, 856, 976, 988, 1020}}, |
{kMachFloat64, |
kArmVldr64, |
kArmVstr64, |
+ &InstructionSelectorTest::Stream::IsDouble, |
{-1020, -948, -796, -696, -612, -364, -320, -308, -128, -112, -108, -104, |
-96, -84, -80, -56, -48, -40, -20, 0, 24, 28, 36, 48, 64, 84, 96, 100, |
108, 116, 120, 140, 156, 408, 432, 444, 772, 832, 940, 1020}}}; |
@@ -1262,7 +1277,8 @@ TEST_P(InstructionSelectorMemoryAccessTest, LoadWithParameters) { |
EXPECT_EQ(memacc.ldr_opcode, s[0]->arch_opcode()); |
EXPECT_EQ(kMode_Offset_RR, s[0]->addressing_mode()); |
EXPECT_EQ(2U, s[0]->InputCount()); |
- EXPECT_EQ(1U, s[0]->OutputCount()); |
+ ASSERT_EQ(1U, s[0]->OutputCount()); |
+ EXPECT_TRUE((s.*memacc.val_predicate)(s[0]->Output())); |
} |
@@ -1278,7 +1294,8 @@ TEST_P(InstructionSelectorMemoryAccessTest, LoadWithImmediateIndex) { |
ASSERT_EQ(2U, s[0]->InputCount()); |
ASSERT_EQ(InstructionOperand::IMMEDIATE, s[0]->InputAt(1)->kind()); |
EXPECT_EQ(index, s.ToInt32(s[0]->InputAt(1))); |
- EXPECT_EQ(1U, s[0]->OutputCount()); |
+ ASSERT_EQ(1U, s[0]->OutputCount()); |
+ EXPECT_TRUE((s.*memacc.val_predicate)(s[0]->Output())); |
} |
} |