Chromium Code Reviews| Index: src/arm/lithium-arm.cc |
| diff --git a/src/arm/lithium-arm.cc b/src/arm/lithium-arm.cc |
| index ffb745750a1b0f240c2bffbe4ef4e266dc00572a..eaf0d2aea5f80fcbf8d0120f931595013e97eb61 100644 |
| --- a/src/arm/lithium-arm.cc |
| +++ b/src/arm/lithium-arm.cc |
| @@ -228,6 +228,13 @@ void LIsObjectAndBranch::PrintDataTo(StringStream* stream) { |
| } |
| +void LIsStringAndBranch::PrintDataTo(StringStream* stream) { |
| + stream->Add("if is_string("); |
| + InputAt(0)->PrintTo(stream); |
| + stream->Add(") then B%d else B%d", true_block_id(), false_block_id()); |
| +} |
| + |
| + |
| void LIsSmiAndBranch::PrintDataTo(StringStream* stream) { |
| stream->Add("if is_smi("); |
| InputAt(0)->PrintTo(stream); |
| @@ -242,6 +249,14 @@ void LIsUndetectableAndBranch::PrintDataTo(StringStream* stream) { |
| } |
| +void LStringCompareAndBranch::PrintDataTo(StringStream* stream) { |
| + stream->Add("if compare_generic("); |
| + InputAt(0)->PrintTo(stream); |
| + InputAt(1)->PrintTo(stream); |
| + stream->Add(") then B%d else B%d", true_block_id(), false_block_id()); |
| +} |
| + |
| + |
| void LHasInstanceTypeAndBranch::PrintDataTo(StringStream* stream) { |
| stream->Add("if has_instance_type("); |
| InputAt(0)->PrintTo(stream); |
| @@ -1400,7 +1415,7 @@ LInstruction* LChunkBuilder::DoCompareGeneric(HCompareGeneric* instr) { |
| LOperand* left = UseFixed(instr->left(), r1); |
| LOperand* right = UseFixed(instr->right(), r0); |
| LCmpT* result = new LCmpT(left, right); |
| - return MarkAsCall(DefineFixed(result, r0), instr); |
| + return AssignEnvironment(MarkAsCall(DefineFixed(result, r0), instr)); |
|
fschneider
2011/11/07 15:34:00
Unintended change? The call to AssignEnvironment s
indutny
2011/11/07 17:06:08
Sorry, fixed
|
| } |
| @@ -1451,6 +1466,13 @@ LInstruction* LChunkBuilder::DoIsObjectAndBranch(HIsObjectAndBranch* instr) { |
| } |
| +LInstruction* LChunkBuilder::DoIsStringAndBranch(HIsStringAndBranch* instr) { |
| + ASSERT(instr->value()->representation().IsTagged()); |
| + LOperand* temp = TempRegister(); |
| + return new LIsStringAndBranch(UseRegisterAtStart(instr->value()), temp); |
| +} |
| + |
| + |
| LInstruction* LChunkBuilder::DoIsSmiAndBranch(HIsSmiAndBranch* instr) { |
| ASSERT(instr->value()->representation().IsTagged()); |
| return new LIsSmiAndBranch(Use(instr->value())); |
| @@ -1465,6 +1487,18 @@ LInstruction* LChunkBuilder::DoIsUndetectableAndBranch( |
| } |
| +LInstruction* LChunkBuilder::DoStringCompareAndBranch( |
| + HStringCompareAndBranch* instr) { |
| + |
| + ASSERT(instr->left()->representation().IsTagged()); |
| + ASSERT(instr->right()->representation().IsTagged()); |
| + LOperand* left = UseFixed(instr->left(), r1); |
| + LOperand* right = UseFixed(instr->right(), r0); |
| + LStringCompareAndBranch* result = new LStringCompareAndBranch(left, right); |
| + return MarkAsCall(result, instr); |
| +} |
| + |
| + |
| LInstruction* LChunkBuilder::DoHasInstanceTypeAndBranch( |
| HHasInstanceTypeAndBranch* instr) { |
| ASSERT(instr->value()->representation().IsTagged()); |