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

Unified Diff: src/a64/macro-assembler-a64.cc

Issue 141713009: A64: Port LSeqStringSetChar optimizations from r16707 and r17521. (Closed) Base URL: https://v8.googlecode.com/svn/branches/experimental/a64
Patch Set: Use enum instead of bool Created 6 years, 10 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/a64/macro-assembler-a64.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/a64/macro-assembler-a64.cc
diff --git a/src/a64/macro-assembler-a64.cc b/src/a64/macro-assembler-a64.cc
index 685500306046946534f9938f066479752e7c99fe..52120335731742d882b748d809594b45244832b2 100644
--- a/src/a64/macro-assembler-a64.cc
+++ b/src/a64/macro-assembler-a64.cc
@@ -3619,13 +3619,17 @@ void MacroAssembler::IndexFromHash(Register hash, Register index) {
}
-void MacroAssembler::EmitSeqStringSetCharCheck(Register string,
- Register index,
- uint32_t encoding_mask) {
- Register scratch = __ Tmp1();
+void MacroAssembler::EmitSeqStringSetCharCheck(
+ Register string,
+ Register index,
+ SeqStringSetCharCheckIndexType index_type,
+ Register scratch,
+ uint32_t encoding_mask) {
ASSERT(!AreAliased(string, index, scratch));
- AssertSmi(index);
+ if (index_type == kIndexIsSmi) {
+ AssertSmi(index);
+ }
// Check that string is an object.
ThrowIfSmi(string, kNonObject);
@@ -3633,16 +3637,17 @@ void MacroAssembler::EmitSeqStringSetCharCheck(Register string,
// Check that string has an appropriate map.
Ldr(scratch, FieldMemOperand(string, HeapObject::kMapOffset));
Ldrb(scratch, FieldMemOperand(scratch, Map::kInstanceTypeOffset));
+
And(scratch, scratch, kStringRepresentationMask | kStringEncodingMask);
Cmp(scratch, encoding_mask);
ThrowIf(ne, kUnexpectedStringType);
- // Check that the index points inside the string.
Ldr(scratch, FieldMemOperand(string, String::kLengthOffset));
- Cmp(index, scratch);
+ Cmp(index, index_type == kIndexIsSmi ? scratch : Operand::UntagSmi(scratch));
ThrowIf(ge, kIndexIsTooLarge);
- Cmp(index, Operand(Smi::FromInt(0)));
+ ASSERT_EQ(0, Smi::FromInt(0));
+ Cmp(index, 0);
ThrowIf(lt, kIndexIsNegative);
}
« no previous file with comments | « src/a64/macro-assembler-a64.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698