Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1084)

Side by Side Diff: src/x64/code-stubs-x64.cc

Issue 11293246: Reverting r12937. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/objects-inl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 4747 matching lines...) Expand 10 before | Expand all | Expand 10 after
4758 __ IncrementCounter(counters->string_add_native(), 1); 4758 __ IncrementCounter(counters->string_add_native(), 1);
4759 __ ret(2 * kPointerSize); 4759 __ ret(2 * kPointerSize);
4760 __ bind(&non_ascii); 4760 __ bind(&non_ascii);
4761 // At least one of the strings is two-byte. Check whether it happens 4761 // At least one of the strings is two-byte. Check whether it happens
4762 // to contain only ASCII characters. 4762 // to contain only ASCII characters.
4763 // rcx: first instance type AND second instance type. 4763 // rcx: first instance type AND second instance type.
4764 // r8: first instance type. 4764 // r8: first instance type.
4765 // r9: second instance type. 4765 // r9: second instance type.
4766 __ testb(rcx, Immediate(kAsciiDataHintMask)); 4766 __ testb(rcx, Immediate(kAsciiDataHintMask));
4767 __ j(not_zero, &ascii_data); 4767 __ j(not_zero, &ascii_data);
4768 __ xor_(r8, r9);
4769 STATIC_ASSERT(kOneByteStringTag != 0 && kAsciiDataHintTag != 0);
4770 __ andb(r8, Immediate(kOneByteStringTag | kAsciiDataHintTag));
4771 __ cmpb(r8, Immediate(kOneByteStringTag | kAsciiDataHintTag));
4772 __ j(equal, &ascii_data);
4768 // Allocate a two byte cons string. 4773 // Allocate a two byte cons string.
4769 __ AllocateTwoByteConsString(rcx, rdi, no_reg, &call_runtime); 4774 __ AllocateTwoByteConsString(rcx, rdi, no_reg, &call_runtime);
4770 __ jmp(&allocated); 4775 __ jmp(&allocated);
4771 4776
4772 // We cannot encounter sliced strings or cons strings here since: 4777 // We cannot encounter sliced strings or cons strings here since:
4773 STATIC_ASSERT(SlicedString::kMinLength >= ConsString::kMinLength); 4778 STATIC_ASSERT(SlicedString::kMinLength >= ConsString::kMinLength);
4774 // Handle creating a flat result from either external or sequential strings. 4779 // Handle creating a flat result from either external or sequential strings.
4775 // Locate the first characters' locations. 4780 // Locate the first characters' locations.
4776 // rax: first string 4781 // rax: first string
4777 // rbx: length of resulting flat string as smi 4782 // rbx: length of resulting flat string as smi
(...skipping 1716 matching lines...) Expand 10 before | Expand all | Expand 10 after
6494 #endif 6499 #endif
6495 6500
6496 __ Ret(); 6501 __ Ret();
6497 } 6502 }
6498 6503
6499 #undef __ 6504 #undef __
6500 6505
6501 } } // namespace v8::internal 6506 } } // namespace v8::internal
6502 6507
6503 #endif // V8_TARGET_ARCH_X64 6508 #endif // V8_TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « src/objects-inl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698