Revert "Add support for long-to-int in the optimizing compiler."
This reverts commit 647b96f29cb81832e698f863884fdba06674c9de.
Change-Id: I552f23585463c676acbd547521b4d3ee5c0342eb
diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc
index e95dbb8..8418ab0 100644
--- a/compiler/optimizing/builder.cc
+++ b/compiler/optimizing/builder.cc
@@ -922,11 +922,6 @@
break;
}
- case Instruction::LONG_TO_INT: {
- Conversion_12x(instruction, Primitive::kPrimLong, Primitive::kPrimInt);
- break;
- }
-
case Instruction::ADD_INT: {
Binop_23x<HAdd>(instruction, Primitive::kPrimInt);
break;
diff --git a/compiler/optimizing/code_generator_arm.cc b/compiler/optimizing/code_generator_arm.cc
index 7f3ebf4..467c2a6 100644
--- a/compiler/optimizing/code_generator_arm.cc
+++ b/compiler/optimizing/code_generator_arm.cc
@@ -22,10 +22,9 @@
#include "mirror/art_method.h"
#include "mirror/class.h"
#include "thread.h"
-#include "utils.h"
+#include "utils/assembler.h"
#include "utils/arm/assembler_arm.h"
#include "utils/arm/managed_register_arm.h"
-#include "utils/assembler.h"
#include "utils/stack_checks.h"
namespace art {
@@ -1334,26 +1333,6 @@
Primitive::Type result_type = conversion->GetResultType();
Primitive::Type input_type = conversion->GetInputType();
switch (result_type) {
- case Primitive::kPrimInt:
- switch (input_type) {
- case Primitive::kPrimLong:
- // long-to-int conversion.
- locations->SetInAt(0, Location::Any());
- locations->SetOut(Location::RequiresRegister(), Location::kNoOutputOverlap);
- break;
-
- case Primitive::kPrimFloat:
- case Primitive::kPrimDouble:
- LOG(FATAL) << "Type conversion from " << input_type
- << " to " << result_type << " not yet implemented";
- break;
-
- default:
- LOG(FATAL) << "Unexpected type conversion from " << input_type
- << " to " << result_type;
- }
- break;
-
case Primitive::kPrimLong:
switch (input_type) {
case Primitive::kPrimByte:
@@ -1377,6 +1356,7 @@
}
break;
+ case Primitive::kPrimInt:
case Primitive::kPrimFloat:
case Primitive::kPrimDouble:
LOG(FATAL) << "Type conversion from " << input_type
@@ -1396,35 +1376,6 @@
Primitive::Type result_type = conversion->GetResultType();
Primitive::Type input_type = conversion->GetInputType();
switch (result_type) {
- case Primitive::kPrimInt:
- switch (input_type) {
- case Primitive::kPrimLong:
- // long-to-int conversion.
- DCHECK(out.IsRegister());
- if (in.IsRegisterPair()) {
- __ Mov(out.As<Register>(), in.AsRegisterPairLow<Register>());
- } else if (in.IsDoubleStackSlot()) {
- __ LoadFromOffset(kLoadWord, out.As<Register>(), SP, in.GetStackIndex());
- } else {
- DCHECK(in.IsConstant());
- DCHECK(in.GetConstant()->IsLongConstant());
- __ LoadImmediate(out.As<Register>(),
- Low32Bits(in.GetConstant()->AsLongConstant()->GetValue()));
- }
- break;
-
- case Primitive::kPrimFloat:
- case Primitive::kPrimDouble:
- LOG(FATAL) << "Type conversion from " << input_type
- << " to " << result_type << " not yet implemented";
- break;
-
- default:
- LOG(FATAL) << "Unexpected type conversion from " << input_type
- << " to " << result_type;
- }
- break;
-
case Primitive::kPrimLong:
switch (input_type) {
case Primitive::kPrimByte:
@@ -1453,6 +1404,7 @@
}
break;
+ case Primitive::kPrimInt:
case Primitive::kPrimFloat:
case Primitive::kPrimDouble:
LOG(FATAL) << "Type conversion from " << input_type
diff --git a/compiler/optimizing/code_generator_x86.cc b/compiler/optimizing/code_generator_x86.cc
index 4706274..d66180b 100644
--- a/compiler/optimizing/code_generator_x86.cc
+++ b/compiler/optimizing/code_generator_x86.cc
@@ -22,7 +22,6 @@
#include "mirror/art_method.h"
#include "mirror/class.h"
#include "thread.h"
-#include "utils.h"
#include "utils/assembler.h"
#include "utils/stack_checks.h"
#include "utils/x86/assembler_x86.h"
@@ -1262,26 +1261,6 @@
Primitive::Type result_type = conversion->GetResultType();
Primitive::Type input_type = conversion->GetInputType();
switch (result_type) {
- case Primitive::kPrimInt:
- switch (input_type) {
- case Primitive::kPrimLong:
- // long-to-int conversion.
- locations->SetInAt(0, Location::Any());
- locations->SetOut(Location::RequiresRegister(), Location::kNoOutputOverlap);
- break;
-
- case Primitive::kPrimFloat:
- case Primitive::kPrimDouble:
- LOG(FATAL) << "Type conversion from " << input_type
- << " to " << result_type << " not yet implemented";
- break;
-
- default:
- LOG(FATAL) << "Unexpected type conversion from " << input_type
- << " to " << result_type;
- }
- break;
-
case Primitive::kPrimLong:
switch (input_type) {
case Primitive::kPrimByte:
@@ -1305,6 +1284,7 @@
}
break;
+ case Primitive::kPrimInt:
case Primitive::kPrimFloat:
case Primitive::kPrimDouble:
LOG(FATAL) << "Type conversion from " << input_type
@@ -1324,34 +1304,6 @@
Primitive::Type result_type = conversion->GetResultType();
Primitive::Type input_type = conversion->GetInputType();
switch (result_type) {
- case Primitive::kPrimInt:
- switch (input_type) {
- case Primitive::kPrimLong:
- // long-to-int conversion.
- if (in.IsRegisterPair()) {
- __ movl(out.As<Register>(), in.AsRegisterPairLow<Register>());
- } else if (in.IsDoubleStackSlot()) {
- __ movl(out.As<Register>(), Address(ESP, in.GetStackIndex()));
- } else {
- DCHECK(in.IsConstant());
- DCHECK(in.GetConstant()->IsLongConstant());
- __ movl(out.As<Register>(),
- Immediate(Low32Bits(in.GetConstant()->AsLongConstant()->GetValue())));
- }
- break;
-
- case Primitive::kPrimFloat:
- case Primitive::kPrimDouble:
- LOG(FATAL) << "Type conversion from " << input_type
- << " to " << result_type << " not yet implemented";
- break;
-
- default:
- LOG(FATAL) << "Unexpected type conversion from " << input_type
- << " to " << result_type;
- }
- break;
-
case Primitive::kPrimLong:
switch (input_type) {
case Primitive::kPrimByte:
@@ -1377,6 +1329,7 @@
}
break;
+ case Primitive::kPrimInt:
case Primitive::kPrimFloat:
case Primitive::kPrimDouble:
LOG(FATAL) << "Type conversion from " << input_type
diff --git a/compiler/optimizing/code_generator_x86_64.cc b/compiler/optimizing/code_generator_x86_64.cc
index 304a008..e09b6ca 100644
--- a/compiler/optimizing/code_generator_x86_64.cc
+++ b/compiler/optimizing/code_generator_x86_64.cc
@@ -23,7 +23,6 @@
#include "mirror/class.h"
#include "mirror/object_reference.h"
#include "thread.h"
-#include "utils.h"
#include "utils/assembler.h"
#include "utils/stack_checks.h"
#include "utils/x86_64/assembler_x86_64.h"
@@ -1260,26 +1259,6 @@
Primitive::Type result_type = conversion->GetResultType();
Primitive::Type input_type = conversion->GetInputType();
switch (result_type) {
- case Primitive::kPrimInt:
- switch (input_type) {
- case Primitive::kPrimLong:
- // long-to-int conversion.
- locations->SetInAt(0, Location::Any());
- locations->SetOut(Location::RequiresRegister(), Location::kNoOutputOverlap);
- break;
-
- case Primitive::kPrimFloat:
- case Primitive::kPrimDouble:
- LOG(FATAL) << "Type conversion from " << input_type
- << " to " << result_type << " not yet implemented";
- break;
-
- default:
- LOG(FATAL) << "Unexpected type conversion from " << input_type
- << " to " << result_type;
- }
- break;
-
case Primitive::kPrimLong:
switch (input_type) {
case Primitive::kPrimByte:
@@ -1305,6 +1284,7 @@
}
break;
+ case Primitive::kPrimInt:
case Primitive::kPrimFloat:
case Primitive::kPrimDouble:
LOG(FATAL) << "Type conversion from " << input_type
@@ -1324,35 +1304,6 @@
Primitive::Type result_type = conversion->GetResultType();
Primitive::Type input_type = conversion->GetInputType();
switch (result_type) {
- case Primitive::kPrimInt:
- switch (input_type) {
- case Primitive::kPrimLong:
- // long-to-int conversion.
- if (in.IsRegister()) {
- __ movl(out.As<CpuRegister>(), in.As<CpuRegister>());
- } else if (in.IsDoubleStackSlot()) {
- __ movl(out.As<CpuRegister>(),
- Address(CpuRegister(RSP), in.GetStackIndex()));
- } else {
- DCHECK(in.IsConstant());
- DCHECK(in.GetConstant()->IsLongConstant());
- __ movl(out.As<CpuRegister>(),
- Immediate(Low32Bits(in.GetConstant()->AsLongConstant()->GetValue())));
- }
- break;
-
- case Primitive::kPrimFloat:
- case Primitive::kPrimDouble:
- LOG(FATAL) << "Type conversion from " << input_type
- << " to " << result_type << " not yet implemented";
- break;
-
- default:
- LOG(FATAL) << "Unexpected type conversion from " << input_type
- << " to " << result_type;
- }
- break;
-
case Primitive::kPrimLong:
switch (input_type) {
DCHECK(out.IsRegister());
@@ -1377,6 +1328,7 @@
}
break;
+ case Primitive::kPrimInt:
case Primitive::kPrimFloat:
case Primitive::kPrimDouble:
LOG(FATAL) << "Type conversion from " << input_type
diff --git a/compiler/optimizing/codegen_test.cc b/compiler/optimizing/codegen_test.cc
index bdf58ed..ecee443 100644
--- a/compiler/optimizing/codegen_test.cc
+++ b/compiler/optimizing/codegen_test.cc
@@ -362,23 +362,6 @@
#undef NOT_LONG_TEST
-TEST(CodegenTest, IntToLongOfLongToInt) {
- const int64_t input = INT64_C(4294967296); // 2^32
- const uint16_t word0 = Low16Bits(Low32Bits(input)); // LSW.
- const uint16_t word1 = High16Bits(Low32Bits(input));
- const uint16_t word2 = Low16Bits(High32Bits(input));
- const uint16_t word3 = High16Bits(High32Bits(input)); // MSW.
- const uint16_t data[] = FIVE_REGISTERS_CODE_ITEM(
- Instruction::CONST_WIDE | 0 << 8, word0, word1, word2, word3,
- Instruction::CONST_WIDE | 2 << 8, 1, 0, 0, 0,
- Instruction::ADD_LONG | 0, 0 << 8 | 2, // v0 <- 2^32 + 1
- Instruction::LONG_TO_INT | 4 << 8 | 0 << 12,
- Instruction::INT_TO_LONG | 2 << 8 | 4 << 12,
- Instruction::RETURN_WIDE | 2 << 8);
-
- TestCodeLong(data, true, 1);
-}
-
TEST(CodegenTest, ReturnAdd1) {
const uint16_t data[] = TWO_REGISTERS_CODE_ITEM(
Instruction::CONST_4 | 3 << 12 | 0,