Revision: 17867
Author: [email protected]
Date: Tue Nov 19 12:04:54 2013 UTC
Log: Remove unused StubType's, freeing 2 bits in Code objects.
[email protected]
Review URL: https://codereview.chromium.org/75973005
http://code.google.com/p/v8/source/detail?r=17867
Modified:
/branches/bleeding_edge/src/arm/stub-cache-arm.cc
/branches/bleeding_edge/src/code-stubs.h
/branches/bleeding_edge/src/ia32/stub-cache-ia32.cc
/branches/bleeding_edge/src/objects.cc
/branches/bleeding_edge/src/objects.h
/branches/bleeding_edge/src/stub-cache.cc
/branches/bleeding_edge/src/x64/stub-cache-x64.cc
=======================================
--- /branches/bleeding_edge/src/arm/stub-cache-arm.cc Mon Nov 18 17:18:14
2013 UTC
+++ /branches/bleeding_edge/src/arm/stub-cache-arm.cc Tue Nov 19 12:04:54
2013 UTC
@@ -1650,7 +1650,7 @@
GenerateMissBranch();
// Return the generated code.
- return GetCode(Code::FIELD, name);
+ return GetCode(Code::FAST, name);
}
@@ -2681,7 +2681,7 @@
Handle<Code> code = CompileCustomCall(object, holder,
Handle<Cell>::null(),
function,
Handle<String>::cast(name),
- Code::CONSTANT);
+ Code::FAST);
// A null handle means bail out to the regular compiler code below.
if (!code.is_null()) return code;
}
@@ -2728,7 +2728,7 @@
GenerateMissBranch();
// Return the generated code.
- return GetCode(Code::INTERCEPTOR, name);
+ return GetCode(Code::FAST, name);
}
@@ -2814,7 +2814,7 @@
__ TailCallExternalReference(store_callback_property, 4, 1);
// Return the generated code.
- return GetCode(kind(), Code::CALLBACKS, name);
+ return GetCode(kind(), Code::FAST, name);
}
@@ -2830,7 +2830,7 @@
masm(), call_optimization, receiver(), scratch3(), 1, values);
// Return the generated code.
- return GetCode(kind(), Code::CALLBACKS, name);
+ return GetCode(kind(), Code::FAST, name);
}
@@ -2913,7 +2913,7 @@
TailCallBuiltin(masm(), MissBuiltin(kind()));
// Return the generated code.
- return GetCode(kind(), Code::INTERCEPTOR, name);
+ return GetCode(kind(), Code::FAST, name);
}
@@ -2930,7 +2930,7 @@
__ Ret();
// Return the generated code.
- return GetCode(kind(), Code::NONEXISTENT, name);
+ return GetCode(kind(), Code::FAST, name);
}
=======================================
--- /branches/bleeding_edge/src/code-stubs.h Fri Nov 15 17:53:35 2013 UTC
+++ /branches/bleeding_edge/src/code-stubs.h Tue Nov 19 12:04:54 2013 UTC
@@ -931,7 +931,7 @@
return UnboxedDoubleBits::decode(bit_field_);
}
- virtual Code::StubType GetStubType() { return Code::FIELD; }
+ virtual Code::StubType GetStubType() { return Code::FAST; }
protected:
LoadFieldStub() : HandlerStub() { }
=======================================
--- /branches/bleeding_edge/src/ia32/stub-cache-ia32.cc Mon Nov 18 17:18:14
2013 UTC
+++ /branches/bleeding_edge/src/ia32/stub-cache-ia32.cc Tue Nov 19 12:04:54
2013 UTC
@@ -1671,7 +1671,7 @@
GenerateMissBranch();
// Return the generated code.
- return GetCode(Code::FIELD, name);
+ return GetCode(Code::FAST, name);
}
@@ -2752,7 +2752,7 @@
Handle<Code> code = CompileCustomCall(object, holder,
Handle<Cell>::null(),
function,
Handle<String>::cast(name),
- Code::CONSTANT);
+ Code::FAST);
// A null handle means bail out to the regular compiler code below.
if (!code.is_null()) return code;
}
@@ -2820,7 +2820,7 @@
GenerateMissBranch();
// Return the generated code.
- return GetCode(Code::INTERCEPTOR, name);
+ return GetCode(Code::FAST, name);
}
@@ -2907,7 +2907,7 @@
__ TailCallExternalReference(store_callback_property, 4, 1);
// Return the generated code.
- return GetCode(kind(), Code::CALLBACKS, name);
+ return GetCode(kind(), Code::FAST, name);
}
@@ -2923,7 +2923,7 @@
masm(), call_optimization, receiver(), scratch1(), 1, values);
// Return the generated code.
- return GetCode(kind(), Code::CALLBACKS, name);
+ return GetCode(kind(), Code::FAST, name);
}
@@ -2990,7 +2990,7 @@
__ TailCallExternalReference(store_ic_property, 4, 1);
// Return the generated code.
- return GetCode(kind(), Code::INTERCEPTOR, name);
+ return GetCode(kind(), Code::FAST, name);
}
@@ -3035,7 +3035,7 @@
__ ret(0);
// Return the generated code.
- return GetCode(kind(), Code::NONEXISTENT, name);
+ return GetCode(kind(), Code::FAST, name);
}
=======================================
--- /branches/bleeding_edge/src/objects.cc Tue Nov 19 11:52:47 2013 UTC
+++ /branches/bleeding_edge/src/objects.cc Tue Nov 19 12:04:54 2013 UTC
@@ -11075,12 +11075,7 @@
const char* Code::StubType2String(StubType type) {
switch (type) {
case NORMAL: return "NORMAL";
- case FIELD: return "FIELD";
- case CONSTANT: return "CONSTANT";
- case CALLBACKS: return "CALLBACKS";
- case INTERCEPTOR: return "INTERCEPTOR";
- case TRANSITION: return "TRANSITION";
- case NONEXISTENT: return "NONEXISTENT";
+ case FAST: return "FAST";
}
UNREACHABLE(); // keep the compiler happy
return NULL;
=======================================
--- /branches/bleeding_edge/src/objects.h Tue Nov 19 10:17:33 2013 UTC
+++ /branches/bleeding_edge/src/objects.h Tue Nov 19 12:04:54 2013 UTC
@@ -5033,12 +5033,7 @@
// Types of stubs.
enum StubType {
NORMAL,
- FIELD,
- CONSTANT,
- CALLBACKS,
- INTERCEPTOR,
- TRANSITION,
- NONEXISTENT
+ FAST
};
typedef int ExtraICState;
@@ -5464,7 +5459,7 @@
// Flags layout. BitField<type, shift, size>.
class ICStateField: public BitField<InlineCacheState, 0, 3> {};
- class TypeField: public BitField<StubType, 3, 3> {};
+ class TypeField: public BitField<StubType, 3, 1> {};
class CacheHolderField: public BitField<InlineCacheHolderFlag, 6, 1> {};
class KindField: public BitField<Kind, 7, 4> {};
class IsPregeneratedField: public BitField<bool, 11, 1> {};
=======================================
--- /branches/bleeding_edge/src/stub-cache.cc Mon Nov 18 17:18:14 2013 UTC
+++ /branches/bleeding_edge/src/stub-cache.cc Tue Nov 19 12:04:54 2013 UTC
@@ -292,7 +292,7 @@
}
Code::Flags flags = Code::ComputeMonomorphicFlags(
- kind, extra_state, cache_holder, Code::CONSTANT, argc);
+ kind, extra_state, cache_holder, Code::FAST, argc);
Handle<Object> probe(stub_holder->map()->FindInCodeCache(*name, flags),
isolate_);
if (probe->IsCode()) return Handle<Code>::cast(probe);
@@ -334,7 +334,7 @@
}
Code::Flags flags = Code::ComputeMonomorphicFlags(
- kind, extra_state, cache_holder, Code::FIELD, argc);
+ kind, extra_state, cache_holder, Code::FAST, argc);
Handle<Object> probe(stub_holder->map()->FindInCodeCache(*name, flags),
isolate_);
if (probe->IsCode()) return Handle<Code>::cast(probe);
@@ -372,7 +372,7 @@
}
Code::Flags flags = Code::ComputeMonomorphicFlags(
- kind, extra_state, cache_holder, Code::INTERCEPTOR, argc);
+ kind, extra_state, cache_holder, Code::FAST, argc);
Handle<Object> probe(stub_holder->map()->FindInCodeCache(*name, flags),
isolate_);
if (probe->IsCode()) return Handle<Code>::cast(probe);
@@ -1259,7 +1259,7 @@
TailCallBuiltin(masm(), MissBuiltin(kind()));
// Return the generated code.
- return GetCode(kind(), Code::FIELD, name);
+ return GetCode(kind(), Code::FAST, name);
}
@@ -1272,7 +1272,7 @@
GenerateLoadConstant(value);
// Return the generated code.
- return GetCode(kind(), Code::CONSTANT, name);
+ return GetCode(kind(), Code::FAST, name);
}
@@ -1286,7 +1286,7 @@
GenerateLoadCallback(reg, callback);
// Return the generated code.
- return GetCode(kind(), Code::CALLBACKS, name);
+ return GetCode(kind(), Code::FAST, name);
}
@@ -1301,7 +1301,7 @@
GenerateLoadCallback(call_optimization);
// Return the generated code.
- return GetCode(kind(), Code::CALLBACKS, name);
+ return GetCode(kind(), Code::FAST, name);
}
@@ -1318,7 +1318,7 @@
GenerateLoadInterceptor(reg, object, holder, &lookup, name);
// Return the generated code.
- return GetCode(kind(), Code::INTERCEPTOR, name);
+ return GetCode(kind(), Code::FAST, name);
}
@@ -1378,7 +1378,7 @@
GenerateLoadViaGetter(masm(), receiver(), getter);
// Return the generated code.
- return GetCode(kind(), Code::CALLBACKS, name);
+ return GetCode(kind(), Code::FAST, name);
}
@@ -1435,7 +1435,7 @@
TailCallBuiltin(masm(), SlowBuiltin(kind()));
// Return the generated code.
- return GetCode(kind(), Code::TRANSITION, name);
+ return GetCode(kind(), Code::FAST, name);
}
@@ -1458,7 +1458,7 @@
TailCallBuiltin(masm(), MissBuiltin(kind()));
// Return the generated code.
- return GetCode(kind(), Code::FIELD, name);
+ return GetCode(kind(), Code::FAST, name);
}
@@ -1470,7 +1470,7 @@
HandlerFrontend(object, receiver(), holder, name);
GenerateStoreViaSetter(masm(), setter);
- return GetCode(kind(), Code::CALLBACKS, name);
+ return GetCode(kind(), Code::FAST, name);
}
@@ -1757,7 +1757,7 @@
if (function->shared()->name()->IsString()) {
function_name =
Handle<String>(String::cast(function->shared()->name()));
}
- return GetCode(Code::CONSTANT, function_name);
+ return GetCode(Code::FAST, function_name);
}
=======================================
--- /branches/bleeding_edge/src/x64/stub-cache-x64.cc Mon Nov 18 17:18:14
2013 UTC
+++ /branches/bleeding_edge/src/x64/stub-cache-x64.cc Tue Nov 19 12:04:54
2013 UTC
@@ -1595,7 +1595,7 @@
GenerateMissBranch();
// Return the generated code.
- return GetCode(Code::FIELD, name);
+ return GetCode(Code::FAST, name);
}
@@ -2652,7 +2652,7 @@
Handle<Code> code = CompileCustomCall(object, holder,
Handle<PropertyCell>::null(),
function,
Handle<String>::cast(name),
- Code::CONSTANT);
+ Code::FAST);
// A null handle means bail out to the regular compiler code below.
if (!code.is_null()) return code;
}
@@ -2720,7 +2720,7 @@
GenerateMissBranch();
// Return the generated code.
- return GetCode(Code::INTERCEPTOR, name);
+ return GetCode(Code::FAST, name);
}
@@ -2808,7 +2808,7 @@
__ TailCallExternalReference(store_callback_property, 4, 1);
// Return the generated code.
- return GetCode(kind(), Code::CALLBACKS, name);
+ return GetCode(kind(), Code::FAST, name);
}
@@ -2824,7 +2824,7 @@
masm(), call_optimization, receiver(), scratch3(), 1, values);
// Return the generated code.
- return GetCode(kind(), Code::CALLBACKS, name);
+ return GetCode(kind(), Code::FAST, name);
}
@@ -2891,7 +2891,7 @@
__ TailCallExternalReference(store_ic_property, 4, 1);
// Return the generated code.
- return GetCode(kind(), Code::INTERCEPTOR, name);
+ return GetCode(kind(), Code::FAST, name);
}
@@ -2943,7 +2943,7 @@
__ ret(0);
// Return the generated code.
- return GetCode(kind(), Code::NONEXISTENT, name);
+ return GetCode(kind(), Code::FAST, name);
}
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
