Index: src/hydrogen-instructions.cc |
=================================================================== |
--- src/hydrogen-instructions.cc (revision 6891) |
+++ src/hydrogen-instructions.cc (working copy) |
@@ -284,33 +284,6 @@ |
} |
-void HLoadKeyedGeneric::InternalSetOperandAt(int index, HValue* value) { |
- if (index < 2) { |
- operands_[index] = value; |
- } else { |
- context_ = value; |
- } |
-} |
- |
- |
-void HStoreKeyedGeneric::InternalSetOperandAt(int index, HValue* value) { |
- if (index < 3) { |
- operands_[index] = value; |
- } else { |
- context_ = value; |
- } |
-} |
- |
- |
-void HStoreNamedGeneric::InternalSetOperandAt(int index, HValue* value) { |
- if (index < 2) { |
- operands_[index] = value; |
- } else { |
- context_ = value; |
- } |
-} |
- |
- |
void HValue::ReplaceAndDelete(HValue* other) { |
ReplaceValue(other); |
Delete(); |
@@ -564,15 +537,10 @@ |
#endif |
-void HCall::PrintDataTo(StringStream* stream) { |
- stream->Add("#%d", argument_count()); |
-} |
- |
- |
void HUnaryCall::PrintDataTo(StringStream* stream) { |
value()->PrintNameTo(stream); |
stream->Add(" "); |
- HCall::PrintDataTo(stream); |
+ stream->Add("#%d", argument_count()); |
} |
@@ -581,7 +549,7 @@ |
stream->Add(" "); |
second()->PrintNameTo(stream); |
stream->Add(" "); |
- HCall::PrintDataTo(stream); |
+ stream->Add("#%d", argument_count()); |
} |
@@ -591,7 +559,7 @@ |
} else { |
stream->Add("%o ", function()->shared()->DebugName()); |
} |
- HCall::PrintDataTo(stream); |
+ stream->Add("#%d", argument_count()); |
} |
@@ -609,13 +577,13 @@ |
void HCallKnownGlobal::PrintDataTo(StringStream* stream) { |
stream->Add("o ", target()->shared()->DebugName()); |
- HCall::PrintDataTo(stream); |
+ stream->Add("#%d", argument_count()); |
} |
void HCallRuntime::PrintDataTo(StringStream* stream) { |
stream->Add("%o ", *name()); |
- HCall::PrintDataTo(stream); |
+ stream->Add("#%d", argument_count()); |
} |
@@ -1162,7 +1130,7 @@ |
} |
-void HLoadKeyed::PrintDataTo(StringStream* stream) { |
+void HLoadKeyedFastElement::PrintDataTo(StringStream* stream) { |
object()->PrintNameTo(stream); |
stream->Add("["); |
key()->PrintNameTo(stream); |
@@ -1170,6 +1138,14 @@ |
} |
+void HLoadKeyedGeneric::PrintDataTo(StringStream* stream) { |
+ object()->PrintNameTo(stream); |
+ stream->Add("["); |
+ key()->PrintNameTo(stream); |
+ stream->Add("]"); |
+} |
+ |
+ |
void HLoadPixelArrayElement::PrintDataTo(StringStream* stream) { |
external_pointer()->PrintNameTo(stream); |
stream->Add("["); |
@@ -1178,7 +1154,7 @@ |
} |
-void HStoreNamed::PrintDataTo(StringStream* stream) { |
+void HStoreNamedGeneric::PrintDataTo(StringStream* stream) { |
object()->PrintNameTo(stream); |
stream->Add("."); |
ASSERT(name()->IsString()); |
@@ -1189,14 +1165,19 @@ |
void HStoreNamedField::PrintDataTo(StringStream* stream) { |
- HStoreNamed::PrintDataTo(stream); |
+ object()->PrintNameTo(stream); |
+ stream->Add("."); |
+ ASSERT(name()->IsString()); |
+ stream->Add(*String::cast(*name())->ToCString()); |
+ stream->Add(" = "); |
+ value()->PrintNameTo(stream); |
if (!transition().is_null()) { |
stream->Add(" (transition map %p)", *transition()); |
} |
} |
-void HStoreKeyed::PrintDataTo(StringStream* stream) { |
+void HStoreKeyedFastElement::PrintDataTo(StringStream* stream) { |
object()->PrintNameTo(stream); |
stream->Add("["); |
key()->PrintNameTo(stream); |
@@ -1205,6 +1186,15 @@ |
} |
+void HStoreKeyedGeneric::PrintDataTo(StringStream* stream) { |
+ object()->PrintNameTo(stream); |
+ stream->Add("["); |
+ key()->PrintNameTo(stream); |
+ stream->Add("] = "); |
+ value()->PrintNameTo(stream); |
+} |
+ |
+ |
void HStorePixelArrayElement::PrintDataTo(StringStream* stream) { |
external_pointer()->PrintNameTo(stream); |
stream->Add("["); |