A64: Rejig truncating and non double to i/smi

src/a64/lithium-a64.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 1114 matching lines @@
     }
   } else if (from.IsDouble()) {
     if (to.IsTagged()) {
       info()->MarkAsDeferredCalling();
       LOperand* value = UseRegister(instr->value());
       LOperand* temp1 = TempRegister();
       LOperand* temp2 = TempRegister();
 
       LNumberTagD* result = new(zone()) LNumberTagD(value, temp1, temp2);
       return AssignPointerMap(DefineAsRegister(result));
-    } else if (to.IsSmi()) {
-      // TODO(all): Split LDoubleToSmi into two instructions.
+    } else {
+      ASSERT(to.IsSmi() || to.IsInteger32());
       LOperand* value = UseRegister(instr->value());
-      LOperand* temp1 = instr->CanTruncateToInt32() ? TempRegister() : NULL;
-      LOperand* temp2 = instr->CanTruncateToInt32() ? TempRegister() : NULL;
-      LDoubleToSmi* result = new(zone()) LDoubleToSmi(value, temp1, temp2);
-      return AssignEnvironment(DefineAsRegister(result));
-    } else {
-      // TODO(all): Split LDoubleToI into two instructions, truncating and not.
-      ASSERT(to.IsInteger32());
-      LOperand* value = UseRegister(instr->value());
-      LOperand* temp1 = instr->CanTruncateToInt32() ? TempRegister() : NULL;
-      LOperand* temp2 = instr->CanTruncateToInt32() ? TempRegister() : NULL;
-      LDoubleToI* result = new(zone()) LDoubleToI(value, temp1, temp2);
-      return AssignEnvironment(DefineAsRegister(result));
+
+      if (instr->CanTruncateToInt32()) {
+        LOperand* temp1 = TempRegister();
+        LOperand* temp2 = TempRegister();
+        LTruncateDoubleToIntOrSmi* result =
+            new(zone()) LTruncateDoubleToIntOrSmi(value, temp1, temp2);
+        return DefineAsRegister(result);
+      } else {
+        LDoubleToIntOrSmi* result = new(zone()) LDoubleToIntOrSmi(value);
+        return AssignEnvironment(DefineAsRegister(result));
+      }
     }
   } else if (from.IsInteger32()) {
     info()->MarkAsDeferredCalling();
     if (to.IsTagged()) {
       HValue* val = instr->value();
 
       if (val->CheckFlag(HInstruction::kUint32)) {
         LOperand* value = UseRegister(val);
         LNumberTagU* result = new(zone()) LNumberTagU(value,
                                                       TempRegister(),
@@ skipping 1345 matching lines @@
 LInstruction* LChunkBuilder::DoWrapReceiver(HWrapReceiver* instr) {
   LOperand* receiver = UseRegister(instr->receiver());
   LOperand* function = UseRegisterAtStart(instr->function());
   LOperand* temp = TempRegister();
   LWrapReceiver* result = new(zone()) LWrapReceiver(receiver, function, temp);
   return AssignEnvironment(DefineAsRegister(result));
 }
 
 
 } }  // namespace v8::internal