| OLD | NEW |
| 1 // Copyright 2013 the V8 project authors. All rights reserved. | 1 // Copyright 2013 the V8 project authors. All rights reserved. |
| 2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
| 3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
| 4 // met: | 4 // met: |
| 5 // | 5 // |
| 6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
| 7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
| 8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
| 9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
| 10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
| (...skipping 4370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4381 Register temp = ToRegister(instr->temp()); | 4381 Register temp = ToRegister(instr->temp()); |
| 4382 Label no_memento_found; | 4382 Label no_memento_found; |
| 4383 __ TestJSArrayForAllocationMemento(object, temp, &no_memento_found); | 4383 __ TestJSArrayForAllocationMemento(object, temp, &no_memento_found); |
| 4384 DeoptimizeIf(equal, instr->environment()); | 4384 DeoptimizeIf(equal, instr->environment()); |
| 4385 __ bind(&no_memento_found); | 4385 __ bind(&no_memento_found); |
| 4386 } | 4386 } |
| 4387 | 4387 |
| 4388 | 4388 |
| 4389 void LCodeGen::DoStringAdd(LStringAdd* instr) { | 4389 void LCodeGen::DoStringAdd(LStringAdd* instr) { |
| 4390 ASSERT(ToRegister(instr->context()).is(rsi)); | 4390 ASSERT(ToRegister(instr->context()).is(rsi)); |
| 4391 if (FLAG_new_string_add) { | 4391 ASSERT(ToRegister(instr->left()).is(rdx)); |
| 4392 ASSERT(ToRegister(instr->left()).is(rdx)); | 4392 ASSERT(ToRegister(instr->right()).is(rax)); |
| 4393 ASSERT(ToRegister(instr->right()).is(rax)); | 4393 StringAddStub stub(instr->hydrogen()->flags(), |
| 4394 NewStringAddStub stub(instr->hydrogen()->flags(), | 4394 isolate()->heap()->GetPretenureMode()); |
| 4395 isolate()->heap()->GetPretenureMode()); | 4395 CallCode(stub.GetCode(isolate()), RelocInfo::CODE_TARGET, instr); |
| 4396 CallCode(stub.GetCode(isolate()), RelocInfo::CODE_TARGET, instr); | |
| 4397 } else { | |
| 4398 EmitPushTaggedOperand(instr->left()); | |
| 4399 EmitPushTaggedOperand(instr->right()); | |
| 4400 StringAddStub stub(instr->hydrogen()->flags()); | |
| 4401 CallCode(stub.GetCode(isolate()), RelocInfo::CODE_TARGET, instr); | |
| 4402 } | |
| 4403 } | 4396 } |
| 4404 | 4397 |
| 4405 | 4398 |
| 4406 void LCodeGen::DoStringCharCodeAt(LStringCharCodeAt* instr) { | 4399 void LCodeGen::DoStringCharCodeAt(LStringCharCodeAt* instr) { |
| 4407 class DeferredStringCharCodeAt V8_FINAL : public LDeferredCode { | 4400 class DeferredStringCharCodeAt V8_FINAL : public LDeferredCode { |
| 4408 public: | 4401 public: |
| 4409 DeferredStringCharCodeAt(LCodeGen* codegen, LStringCharCodeAt* instr) | 4402 DeferredStringCharCodeAt(LCodeGen* codegen, LStringCharCodeAt* instr) |
| 4410 : LDeferredCode(codegen), instr_(instr) { } | 4403 : LDeferredCode(codegen), instr_(instr) { } |
| 4411 virtual void Generate() V8_OVERRIDE { | 4404 virtual void Generate() V8_OVERRIDE { |
| 4412 codegen()->DoDeferredStringCharCodeAt(instr_); | 4405 codegen()->DoDeferredStringCharCodeAt(instr_); |
| (...skipping 1223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5636 FixedArray::kHeaderSize - kPointerSize)); | 5629 FixedArray::kHeaderSize - kPointerSize)); |
| 5637 __ bind(&done); | 5630 __ bind(&done); |
| 5638 } | 5631 } |
| 5639 | 5632 |
| 5640 | 5633 |
| 5641 #undef __ | 5634 #undef __ |
| 5642 | 5635 |
| 5643 } } // namespace v8::internal | 5636 } } // namespace v8::internal |
| 5644 | 5637 |
| 5645 #endif // V8_TARGET_ARCH_X64 | 5638 #endif // V8_TARGET_ARCH_X64 |
| OLD | NEW |