Skip to content

V
V8
Commit 6777eecf authored by Igor Sheludko's avatar Igor Sheludko Committed by Commit Bot
Browse files
Options

[builtins] Remove ASH builtin macro in favor of ASM macro. 

BUG=v8:6116

Change-Id: I8e2587926f9e11f022624778fd5168799d20d2df
Reviewed-on: https://chromium-review.googlesource.com/461158Reviewed-by: 's avatarToon Verwaest <verwaest@chromium.org>
Commit-Queue: Igor Sheludko <ishell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#44186}
parent 3cfacade
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 29 deletions
src/builtins/builtins-descriptors.h
View file @ 6777eecf
......@@ -30,8 +30,7 @@ namespace internal {
typedef InterfaceDescriptor##Descriptor Builtin_##Name##_InterfaceDescriptor;
BUILTIN_LIST(IGNORE_BUILTIN, IGNORE_BUILTIN, DEFINE_TFJ_INTERFACE_DESCRIPTOR,
DEFINE_TFS_INTERFACE_DESCRIPTOR, IGNORE_BUILTIN, IGNORE_BUILTIN,
IGNORE_BUILTIN)
DEFINE_TFS_INTERFACE_DESCRIPTOR, IGNORE_BUILTIN, IGNORE_BUILTIN)
#undef DEFINE_TFJ_INTERFACE_DESCRIPTOR
......
src/builtins/builtins.cc
View file @ 6777eecf
......@@ -151,20 +151,15 @@ void Builtins::SetUp(Isolate* isolate, bool create_heap_objects) {
code = \
BuildWithMacroAssembler(isolate, Generate_##Name, kBuiltinFlags, #Name); \
builtins_[index++] = code;
#define BUILD_ASH(Name, Kind, Extra) \
code = BuildWithMacroAssembler( \
isolate, Generate_##Name, Code::ComputeFlags(Code::Kind, Extra), #Name); \
builtins_[index++] = code;
BUILTIN_LIST(BUILD_CPP, BUILD_API, BUILD_TFJ, BUILD_TFS, BUILD_ASM,
BUILD_ASH, BUILD_ASM);
BUILD_ASM);
#undef BUILD_CPP
#undef BUILD_API
#undef BUILD_TFJ
#undef BUILD_TFS
#undef BUILD_ASM
#undef BUILD_ASH
CHECK_EQ(builtin_count, index);
for (int i = 0; i < builtin_count; i++) {
Code::cast(builtins_[i])->set_builtin_index(i);
......@@ -336,7 +331,7 @@ bool Builtins::IsCpp(int index) {
return true;
#define BUILTIN_LIST_CPP(V) \
BUILTIN_LIST(V, IGNORE_BUILTIN, IGNORE_BUILTIN, IGNORE_BUILTIN, \
IGNORE_BUILTIN, IGNORE_BUILTIN, IGNORE_BUILTIN)
IGNORE_BUILTIN, IGNORE_BUILTIN)
BUILTIN_LIST_CPP(CASE)
#undef BUILTIN_LIST_CPP
#undef CASE
......@@ -355,7 +350,7 @@ bool Builtins::IsApi(int index) {
return true;
#define BUILTIN_LIST_API(V) \
BUILTIN_LIST(IGNORE_BUILTIN, V, IGNORE_BUILTIN, IGNORE_BUILTIN, \
IGNORE_BUILTIN, IGNORE_BUILTIN, IGNORE_BUILTIN)
IGNORE_BUILTIN, IGNORE_BUILTIN)
BUILTIN_LIST_API(CASE);
#undef BUILTIN_LIST_API
#undef CASE
......
src/builtins/builtins.h
View file @ 6777eecf
......@@ -46,12 +46,10 @@ class Isolate;
// Args: name, code kind, extra IC state, interface descriptor, return_size
// ASM: Builtin in platform-dependent assembly.
// Args: name
// ASH: Handlers implemented in platform-dependent assembly.
// Args: name, code kind, extra IC state
// DBG: Builtin in platform-dependent assembly, used by the debugger.
// Args: name
#define BUILTIN_LIST_BASE(CPP, API, TFJ, TFS, ASM, ASH, DBG) \
#define BUILTIN_LIST_BASE(CPP, API, TFJ, TFS, ASM, DBG) \
ASM(Abort) \
/* Code aging */ \
CODE_AGE_LIST_WITH_ARG(DECLARE_CODE_AGE_BUILTIN, ASM) \
......@@ -241,12 +239,12 @@ class Isolate;
1) \
TFS(LoadField, BUILTIN, kNoExtraICState, LoadField, 1) \
TFS(LoadIC_FunctionPrototype, HANDLER, Code::LOAD_IC, LoadWithVector, 1) \
ASH(LoadIC_Getter_ForDeopt, BUILTIN, kNoExtraICState) \
ASM(LoadIC_Getter_ForDeopt) \
TFS(LoadIC_Miss, BUILTIN, kNoExtraICState, LoadWithVector, 1) \
TFS(LoadIC_Slow, HANDLER, Code::LOAD_IC, LoadWithVector, 1) \
TFS(LoadIC_Uninitialized, BUILTIN, kNoExtraICState, LoadWithVector, 1) \
TFS(StoreIC_Miss, BUILTIN, kNoExtraICState, StoreWithVector, 1) \
ASH(StoreIC_Setter_ForDeopt, BUILTIN, kNoExtraICState) \
ASM(StoreIC_Setter_ForDeopt) \
TFS(StoreIC_Uninitialized, BUILTIN, kNoExtraICState, StoreWithVector, 1) \
TFS(StoreICStrict_Uninitialized, BUILTIN, kNoExtraICState, StoreWithVector, \
1) \
......@@ -949,16 +947,16 @@ class Isolate;
TFJ(AsyncIteratorValueUnwrap, 1, kValue)
#ifdef V8_I18N_SUPPORT
#define BUILTIN_LIST(CPP, API, TFJ, TFS, ASM, ASH, DBG) \
BUILTIN_LIST_BASE(CPP, API, TFJ, TFS, ASM, ASH, DBG) \
\
/* ES #sec-string.prototype.tolowercase */ \
CPP(StringPrototypeToLowerCaseI18N) \
/* ES #sec-string.prototype.touppercase */ \
#define BUILTIN_LIST(CPP, API, TFJ, TFS, ASM, DBG) \
BUILTIN_LIST_BASE(CPP, API, TFJ, TFS, ASM, DBG) \
\
/* ES #sec-string.prototype.tolowercase */ \
CPP(StringPrototypeToLowerCaseI18N) \
/* ES #sec-string.prototype.touppercase */ \
CPP(StringPrototypeToUpperCaseI18N)
#else
#define BUILTIN_LIST(CPP, API, TFJ, TFS, ASM, ASH, DBG) \
BUILTIN_LIST_BASE(CPP, API, TFJ, TFS, ASM, ASH, DBG)
#define BUILTIN_LIST(CPP, API, TFJ, TFS, ASM, DBG) \
BUILTIN_LIST_BASE(CPP, API, TFJ, TFS, ASM, DBG)
#endif // V8_I18N_SUPPORT
#define BUILTIN_PROMISE_REJECTION_PREDICTION_LIST(V) \
......@@ -977,23 +975,23 @@ class Isolate;
#define IGNORE_BUILTIN(...)
#define BUILTIN_LIST_ALL(V) BUILTIN_LIST(V, V, V, V, V, V, V)
#define BUILTIN_LIST_ALL(V) BUILTIN_LIST(V, V, V, V, V, V)
#define BUILTIN_LIST_TFS(V) \
BUILTIN_LIST(IGNORE_BUILTIN, IGNORE_BUILTIN, IGNORE_BUILTIN, V, \
IGNORE_BUILTIN, IGNORE_BUILTIN, IGNORE_BUILTIN)
IGNORE_BUILTIN, IGNORE_BUILTIN)
#define BUILTIN_LIST_C(V) \
BUILTIN_LIST(V, V, IGNORE_BUILTIN, IGNORE_BUILTIN, IGNORE_BUILTIN, \
IGNORE_BUILTIN, IGNORE_BUILTIN)
IGNORE_BUILTIN)
#define BUILTIN_LIST_A(V) \
BUILTIN_LIST(IGNORE_BUILTIN, IGNORE_BUILTIN, IGNORE_BUILTIN, IGNORE_BUILTIN, \
V, V, V)
V, V)
#define BUILTIN_LIST_DBG(V) \
BUILTIN_LIST(IGNORE_BUILTIN, IGNORE_BUILTIN, IGNORE_BUILTIN, IGNORE_BUILTIN, \
IGNORE_BUILTIN, IGNORE_BUILTIN, V)
IGNORE_BUILTIN, V)
#define BUILTINS_WITH_UNTAGGED_PARAMS(V) V(WasmCompileLazy)
......@@ -1113,7 +1111,7 @@ class Builtins {
static void Generate_##Name(compiler::CodeAssemblerState* state);
BUILTIN_LIST(IGNORE_BUILTIN, IGNORE_BUILTIN, DECLARE_TF, DECLARE_TF,
DECLARE_ASM, DECLARE_ASM, DECLARE_ASM)
DECLARE_ASM, DECLARE_ASM)
#undef DECLARE_ASM
#undef DECLARE_TF
......
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