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

Unified Diff: src/x64/ic-x64.cc

Issue 1628003: Port string stub for keyed loads to x64 and ARM (http://code.google.com/p/v8/... (Closed) Base URL: http://v8.googlecode.com/svn/trunk/
Patch Set: '' Created 10 years, 8 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/arm/ic-arm.cc ('k') | test/mjsunit/string-index.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/x64/ic-x64.cc
===================================================================
--- src/x64/ic-x64.cc (revision 4328)
+++ src/x64/ic-x64.cc (working copy)
@@ -524,7 +524,32 @@
// -- rsp[16] : receiver
// -----------------------------------
- GenerateGeneric(masm);
+ Label miss, index_ok;
+
+ // Check that the receiver isn't a smi.
+ __ movq(rcx, Operand(rsp, 2 * kPointerSize));
+ __ JumpIfSmi(rcx, &miss);
+
+ // Check that the receiver is a string.
+ Condition is_string = masm->IsObjectStringType(rcx, rax, rbx);
+ __ j(NegateCondition(is_string), &miss);
+
+ // Check if key is a smi or a heap number.
+ __ movq(rax, Operand(rsp, kPointerSize));
+ __ JumpIfSmi(rax, &index_ok);
+ __ CheckMap(rax, Factory::heap_number_map(), &miss, false);
+
+ __ bind(&index_ok);
+ // Duplicate receiver and key since they are expected on the stack after
+ // the KeyedLoadIC call.
+ __ pop(rbx); // return address
+ __ push(rcx); // receiver
+ __ push(rax); // key
+ __ push(rbx); // return address
+ __ InvokeBuiltin(Builtins::STRING_CHAR_AT, JUMP_FUNCTION);
+
+ __ bind(&miss);
+ GenerateMiss(masm);
}
« no previous file with comments | « src/arm/ic-arm.cc ('k') | test/mjsunit/string-index.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698