Commit 073ab01d authored by verwaest@chromium.org's avatar verwaest@chromium.org

MIPS: Replace special IC builtins and stubs in the map's cache by codestubs.

Port r13453 (94525069)

BUG=
TEST=

Review URL: https://chromiumcodereview.appspot.com/12051014
Patch from Akos Palfi <palfia@homejinni.com>.

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@13466 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent a3de98b4
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include "code-stubs.h" #include "code-stubs.h"
#include "codegen.h" #include "codegen.h"
#include "regexp-macro-assembler.h" #include "regexp-macro-assembler.h"
#include "stub-cache.h"
namespace v8 { namespace v8 {
namespace internal { namespace internal {
...@@ -4543,6 +4544,37 @@ void InstanceofStub::Generate(MacroAssembler* masm) { ...@@ -4543,6 +4544,37 @@ void InstanceofStub::Generate(MacroAssembler* masm) {
} }
void StringLengthStub::Generate(MacroAssembler* masm) {
Label miss;
Register receiver;
if (kind() == Code::KEYED_LOAD_IC) {
// ----------- S t a t e -------------
// -- ra : return address
// -- a0 : key
// -- a1 : receiver
// -----------------------------------
__ Branch(&miss, ne, a0,
Operand(masm->isolate()->factory()->length_symbol()));
receiver = a1;
} else {
ASSERT(kind() == Code::LOAD_IC);
// ----------- S t a t e -------------
// -- a2 : name
// -- ra : return address
// -- a0 : receiver
// -- sp[0] : receiver
// -----------------------------------
receiver = a0;
}
StubCompiler::GenerateLoadStringLength(masm, receiver, a3, t0, &miss,
support_wrapper_);
__ bind(&miss);
StubCompiler::GenerateLoadMiss(masm, kind());
}
Register InstanceofStub::left() { return a0; } Register InstanceofStub::left() { return a0; }
......
...@@ -230,23 +230,6 @@ void LoadIC::GenerateArrayLength(MacroAssembler* masm) { ...@@ -230,23 +230,6 @@ void LoadIC::GenerateArrayLength(MacroAssembler* masm) {
} }
void LoadIC::GenerateStringLength(MacroAssembler* masm, bool support_wrappers) {
// ----------- S t a t e -------------
// -- a2 : name
// -- lr : return address
// -- a0 : receiver
// -- sp[0] : receiver
// -----------------------------------
Label miss;
StubCompiler::GenerateLoadStringLength(masm, a0, a1, a3, &miss,
support_wrappers);
// Cache miss: Jump to runtime.
__ bind(&miss);
StubCompiler::GenerateLoadMiss(masm, Code::LOAD_IC);
}
void LoadIC::GenerateFunctionPrototype(MacroAssembler* masm) { void LoadIC::GenerateFunctionPrototype(MacroAssembler* masm) {
// ----------- S t a t e ------------- // ----------- S t a t e -------------
// -- a2 : name // -- a2 : name
......
...@@ -3223,31 +3223,6 @@ Handle<Code> KeyedLoadStubCompiler::CompileLoadArrayLength( ...@@ -3223,31 +3223,6 @@ Handle<Code> KeyedLoadStubCompiler::CompileLoadArrayLength(
} }
Handle<Code> KeyedLoadStubCompiler::CompileLoadStringLength(
Handle<String> name) {
// ----------- S t a t e -------------
// -- ra : return address
// -- a0 : key
// -- a1 : receiver
// -----------------------------------
Label miss;
Counters* counters = masm()->isolate()->counters();
__ IncrementCounter(counters->keyed_load_string_length(), 1, a2, a3);
// Check the key is the cached one.
__ Branch(&miss, ne, a0, Operand(name));
GenerateLoadStringLength(masm(), a1, a2, a3, &miss, true);
__ bind(&miss);
__ DecrementCounter(counters->keyed_load_string_length(), 1, a2, a3);
GenerateLoadMiss(masm(), Code::KEYED_LOAD_IC);
return GetCode(Code::CALLBACKS, name);
}
Handle<Code> KeyedLoadStubCompiler::CompileLoadFunctionPrototype( Handle<Code> KeyedLoadStubCompiler::CompileLoadFunctionPrototype(
Handle<String> name) { Handle<String> name) {
// ----------- S t a t e ------------- // ----------- S t a t e -------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment