Initial steps towards cleaning up integer arithmetic IR.

runtime/vm/il_printer.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/il_printer.h"
 
 #include "vm/flow_graph_range_analysis.h"
 #include "vm/intermediate_language.h"
 #include "vm/os.h"
 #include "vm/parser.h"
@@ skipping 574 matching lines @@
   Definition::PrintOperandsTo(f);
 }
 
 
 void ExtractNthOutputInstr::PrintOperandsTo(BufferFormatter* f) const {
   f->Print("Extract %" Pd " from ", index());
   Definition::PrintOperandsTo(f);
 }
 
 
-void BinarySmiOpInstr::PrintTo(BufferFormatter* f) const {
-  Definition::PrintTo(f);
-  f->Print(" %co", overflow_ ? '+' : '-');
-  f->Print(" %ct", IsTruncating() ? '+' : '-');
+void UnaryIntegerOpInstr::PrintOperandsTo(BufferFormatter* f) const {
+  f->Print("%s, ", Token::Str(op_kind()));
+  value()->PrintTo(f);
 }
 
 
-void BinarySmiOpInstr::PrintOperandsTo(BufferFormatter* f) const {
-  f->Print("%s, ", Token::Str(op_kind()));
+void BinaryIntegerOpInstr::PrintOperandsTo(BufferFormatter* f) const {
+  f->Print("%s", Token::Str(op_kind()));
+  if (is_truncating()) {
+    f->Print(" [tr]");
+  } else if (!can_overflow()) {
+    f->Print(" [-o]");
+  }
+  f->Print(", ");
   left()->PrintTo(f);
   f->Print(", ");
   right()->PrintTo(f);
-}
-
-
-void BinaryInt32OpInstr::PrintTo(BufferFormatter* f) const {
-  Definition::PrintTo(f);
-  f->Print(" %co", overflow_ ? '+' : '-');
-  f->Print(" %ct", IsTruncating() ? '+' : '-');
-}
-
-
-void BinaryInt32OpInstr::PrintOperandsTo(BufferFormatter* f) const {
-  f->Print("%s, ", Token::Str(op_kind()));
-  left()->PrintTo(f);
-  f->Print(", ");
-  right()->PrintTo(f);
 }
 
 
 void BinaryDoubleOpInstr::PrintOperandsTo(BufferFormatter* f) const {
   f->Print("%s, ", Token::Str(op_kind()));
   left()->PrintTo(f);
   f->Print(", ");
   right()->PrintTo(f);
 }
 
@@ skipping 232 matching lines @@
 
 
 void BinaryInt32x4OpInstr::PrintOperandsTo(BufferFormatter* f) const {
   f->Print("%s, ", Token::Str(op_kind()));
   left()->PrintTo(f);
   f->Print(", ");
   right()->PrintTo(f);
 }
 
 
-void BinaryMintOpInstr::PrintOperandsTo(BufferFormatter* f) const {
-  f->Print("%s, ", Token::Str(op_kind()));
-  left()->PrintTo(f);
-  f->Print(", ");
-  right()->PrintTo(f);
-}
-
-
-void ShiftMintOpInstr::PrintOperandsTo(BufferFormatter* f) const {
-  f->Print("%s, ", Token::Str(op_kind()));
-  left()->PrintTo(f);
-  f->Print(", ");
-  right()->PrintTo(f);
-}
-
-
-void UnaryMintOpInstr::PrintOperandsTo(BufferFormatter* f) const {
-  f->Print("%s, ", Token::Str(op_kind()));
-  value()->PrintTo(f);
-}
-
-
-void BinaryUint32OpInstr::PrintOperandsTo(BufferFormatter* f) const {
-  f->Print("%s, ", Token::Str(op_kind()));
-  left()->PrintTo(f);
-  f->Print(", ");
-  right()->PrintTo(f);
-}
-
-
-void ShiftUint32OpInstr::PrintOperandsTo(BufferFormatter* f) const {
-  f->Print("%s, ", Token::Str(op_kind()));
-  left()->PrintTo(f);
-  f->Print(", ");
-  right()->PrintTo(f);
-}
-
-
-void UnaryUint32OpInstr::PrintOperandsTo(BufferFormatter* f) const {
-  f->Print("%s, ", Token::Str(op_kind()));
-  value()->PrintTo(f);
-}
-
-
-void UnarySmiOpInstr::PrintOperandsTo(BufferFormatter* f) const {
-  f->Print("%s, ", Token::Str(op_kind()));
-  value()->PrintTo(f);
-}
-
-
 void UnaryDoubleOpInstr::PrintOperandsTo(BufferFormatter* f) const {
   f->Print("%s, ", Token::Str(op_kind()));
   value()->PrintTo(f);
 }
 
 
 void CheckClassInstr::PrintOperandsTo(BufferFormatter* f) const {
   value()->PrintTo(f);
   PrintICDataHelper(f, unary_checks());
   if (IsNullCheck()) {
@@ skipping 236 matching lines @@
 }
 
 const char* Environment::ToCString() const {
   char buffer[1024];
   BufferFormatter bf(buffer, 1024);
   PrintTo(&bf);
   return Isolate::Current()->current_zone()->MakeCopyOfString(buffer);
 }
 
 }  // namespace dart