| OLD | NEW |
| 1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 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 3920 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3931 // edi: length of second argument | 3931 // edi: length of second argument |
| 3932 StringHelper::GenerateCopyCharacters(masm, ecx, edx, edi, ebx, false); | 3932 StringHelper::GenerateCopyCharacters(masm, ecx, edx, edi, ebx, false); |
| 3933 __ IncrementCounter(counters->string_add_native(), 1); | 3933 __ IncrementCounter(counters->string_add_native(), 1); |
| 3934 __ ret(2 * kPointerSize); | 3934 __ ret(2 * kPointerSize); |
| 3935 | 3935 |
| 3936 // Recover stack pointer before jumping to runtime. | 3936 // Recover stack pointer before jumping to runtime. |
| 3937 __ bind(&call_runtime_drop_two); | 3937 __ bind(&call_runtime_drop_two); |
| 3938 __ Drop(2); | 3938 __ Drop(2); |
| 3939 // Just jump to runtime to add the two strings. | 3939 // Just jump to runtime to add the two strings. |
| 3940 __ bind(&call_runtime); | 3940 __ bind(&call_runtime); |
| 3941 if ((flags_ & STRING_ADD_ERECT_FRAME) != 0) { | 3941 __ TailCallRuntime(Runtime::kStringAdd, 2, 1); |
| 3942 GenerateRegisterArgsPop(masm, ecx); | |
| 3943 // Build a frame | |
| 3944 { | |
| 3945 FrameScope scope(masm, StackFrame::INTERNAL); | |
| 3946 GenerateRegisterArgsPush(masm); | |
| 3947 __ CallRuntime(Runtime::kStringAdd, 2); | |
| 3948 } | |
| 3949 __ ret(0); | |
| 3950 } else { | |
| 3951 __ TailCallRuntime(Runtime::kStringAdd, 2, 1); | |
| 3952 } | |
| 3953 | 3942 |
| 3954 if (call_builtin.is_linked()) { | 3943 if (call_builtin.is_linked()) { |
| 3955 __ bind(&call_builtin); | 3944 __ bind(&call_builtin); |
| 3956 if ((flags_ & STRING_ADD_ERECT_FRAME) != 0) { | 3945 __ InvokeBuiltin(builtin_id, JUMP_FUNCTION); |
| 3957 GenerateRegisterArgsPop(masm, ecx); | |
| 3958 // Build a frame | |
| 3959 { | |
| 3960 FrameScope scope(masm, StackFrame::INTERNAL); | |
| 3961 GenerateRegisterArgsPush(masm); | |
| 3962 __ InvokeBuiltin(builtin_id, CALL_FUNCTION); | |
| 3963 } | |
| 3964 __ ret(0); | |
| 3965 } else { | |
| 3966 __ InvokeBuiltin(builtin_id, JUMP_FUNCTION); | |
| 3967 } | |
| 3968 } | 3946 } |
| 3969 } | 3947 } |
| 3970 | 3948 |
| 3971 | 3949 |
| 3972 void StringAddStub::GenerateRegisterArgsPush(MacroAssembler* masm) { | 3950 void StringAddStub::GenerateRegisterArgsPush(MacroAssembler* masm) { |
| 3973 __ push(eax); | 3951 __ push(eax); |
| 3974 __ push(edx); | 3952 __ push(edx); |
| 3975 } | 3953 } |
| 3976 | 3954 |
| 3977 | 3955 |
| (...skipping 2045 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6023 __ bind(&fast_elements_case); | 6001 __ bind(&fast_elements_case); |
| 6024 GenerateCase(masm, FAST_ELEMENTS); | 6002 GenerateCase(masm, FAST_ELEMENTS); |
| 6025 } | 6003 } |
| 6026 | 6004 |
| 6027 | 6005 |
| 6028 #undef __ | 6006 #undef __ |
| 6029 | 6007 |
| 6030 } } // namespace v8::internal | 6008 } } // namespace v8::internal |
| 6031 | 6009 |
| 6032 #endif // V8_TARGET_ARCH_IA32 | 6010 #endif // V8_TARGET_ARCH_IA32 |
| OLD | NEW |