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

Side by Side Diff: src/arm/code-stubs-arm.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 | « no previous file | src/ia32/code-stubs-ia32.cc » ('j') | 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 6480 matching lines...) Expand 10 before | Expand all | Expand 10 after
6491 __ Ret(); 6491 __ Ret();
6492 6492
6493 __ bind(&non_ascii); 6493 __ bind(&non_ascii);
6494 // At least one of the strings is two-byte. Check whether it happens 6494 // At least one of the strings is two-byte. Check whether it happens
6495 // to contain only ASCII characters. 6495 // to contain only ASCII characters.
6496 // r4: first instance type. 6496 // r4: first instance type.
6497 // r5: second instance type. 6497 // r5: second instance type.
6498 __ tst(r4, Operand(kAsciiDataHintMask)); 6498 __ tst(r4, Operand(kAsciiDataHintMask));
6499 __ tst(r5, Operand(kAsciiDataHintMask), ne); 6499 __ tst(r5, Operand(kAsciiDataHintMask), ne);
6500 __ b(ne, &ascii_data); 6500 __ b(ne, &ascii_data);
6501 __ eor(r4, r4, Operand(r5));
6502 STATIC_ASSERT(kOneByteStringTag != 0 && kAsciiDataHintTag != 0);
6503 __ and_(r4, r4, Operand(kOneByteStringTag | kAsciiDataHintTag));
6504 __ cmp(r4, Operand(kOneByteStringTag | kAsciiDataHintTag));
6505 __ b(eq, &ascii_data);
6501 6506
6502 // Allocate a two byte cons string. 6507 // Allocate a two byte cons string.
6503 __ AllocateTwoByteConsString(r7, r6, r4, r5, &call_runtime); 6508 __ AllocateTwoByteConsString(r7, r6, r4, r5, &call_runtime);
6504 __ jmp(&allocated); 6509 __ jmp(&allocated);
6505 6510
6506 // We cannot encounter sliced strings or cons strings here since: 6511 // We cannot encounter sliced strings or cons strings here since:
6507 STATIC_ASSERT(SlicedString::kMinLength >= ConsString::kMinLength); 6512 STATIC_ASSERT(SlicedString::kMinLength >= ConsString::kMinLength);
6508 // Handle creating a flat result from either external or sequential strings. 6513 // Handle creating a flat result from either external or sequential strings.
6509 // Locate the first characters' locations. 6514 // Locate the first characters' locations.
6510 // r0: first string 6515 // r0: first string
(...skipping 1113 matching lines...) Expand 10 before | Expand all | Expand 10 after
7624 7629
7625 __ Pop(lr, r5, r1); 7630 __ Pop(lr, r5, r1);
7626 __ Ret(); 7631 __ Ret();
7627 } 7632 }
7628 7633
7629 #undef __ 7634 #undef __
7630 7635
7631 } } // namespace v8::internal 7636 } } // namespace v8::internal
7632 7637
7633 #endif // V8_TARGET_ARCH_ARM 7638 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « no previous file | src/ia32/code-stubs-ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698