Skip to content

V
V8
Commit c8a0c0bd authored by yangguo's avatar yangguo Committed by Commit bot
Browse files
Options

[builtins] move builtin files to src/builtins/. 

R=bmeurer@chromium.org
BUG=v8:5197

Review-Url: https://codereview.chromium.org/2145023002
Cr-Commit-Position: refs/heads/master@{#37740}
parent d23c8a17
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 258 additions and 765 deletions
BUILD.gn
View file @ c8a0c0bd
......@@ -835,8 +835,8 @@ v8_source_set("v8_base") {
"src/bit-vector.h",
"src/bootstrapper.cc",
"src/bootstrapper.h",
"src/builtins.cc",
"src/builtins.h",
"src/builtins/builtins.cc",
"src/builtins/builtins.h",
"src/cached-powers.cc",
"src/cached-powers.h",
"src/cancelable-task.cc",
......@@ -1571,6 +1571,7 @@ v8_source_set("v8_base") {
if (v8_target_cpu == "x86") {
sources += [
"src/builtins/ia32/builtins-ia32.cc",
"src/compiler/ia32/code-generator-ia32.cc",
"src/compiler/ia32/instruction-codes-ia32.h",
"src/compiler/ia32/instruction-scheduler-ia32.cc",
......@@ -1586,7 +1587,6 @@ v8_source_set("v8_base") {
"src/ia32/assembler-ia32-inl.h",
"src/ia32/assembler-ia32.cc",
"src/ia32/assembler-ia32.h",
"src/ia32/builtins-ia32.cc",
"src/ia32/code-stubs-ia32.cc",
"src/ia32/code-stubs-ia32.h",
"src/ia32/codegen-ia32.cc",
......@@ -1609,6 +1609,7 @@ v8_source_set("v8_base") {
]
} else if (v8_target_cpu == "x64") {
sources += [
"src/builtins/x64/builtins-x64.cc",
"src/compiler/x64/code-generator-x64.cc",
"src/compiler/x64/instruction-codes-x64.h",
"src/compiler/x64/instruction-scheduler-x64.cc",
......@@ -1631,7 +1632,6 @@ v8_source_set("v8_base") {
"src/x64/assembler-x64-inl.h",
"src/x64/assembler-x64.cc",
"src/x64/assembler-x64.h",
"src/x64/builtins-x64.cc",
"src/x64/code-stubs-x64.cc",
"src/x64/code-stubs-x64.h",
"src/x64/codegen-x64.cc",
......@@ -1650,7 +1650,6 @@ v8_source_set("v8_base") {
"src/arm/assembler-arm-inl.h",
"src/arm/assembler-arm.cc",
"src/arm/assembler-arm.h",
"src/arm/builtins-arm.cc",
"src/arm/code-stubs-arm.cc",
"src/arm/code-stubs-arm.h",
"src/arm/codegen-arm.cc",
......@@ -1668,6 +1667,7 @@ v8_source_set("v8_base") {
"src/arm/macro-assembler-arm.h",
"src/arm/simulator-arm.cc",
"src/arm/simulator-arm.h",
"src/builtins/arm/builtins-arm.cc",
"src/compiler/arm/code-generator-arm.cc",
"src/compiler/arm/instruction-codes-arm.h",
"src/compiler/arm/instruction-scheduler-arm.cc",
......@@ -1693,7 +1693,6 @@ v8_source_set("v8_base") {
"src/arm64/assembler-arm64-inl.h",
"src/arm64/assembler-arm64.cc",
"src/arm64/assembler-arm64.h",
"src/arm64/builtins-arm64.cc",
"src/arm64/code-stubs-arm64.cc",
"src/arm64/code-stubs-arm64.h",
"src/arm64/codegen-arm64.cc",
......@@ -1721,6 +1720,7 @@ v8_source_set("v8_base") {
"src/arm64/simulator-arm64.h",
"src/arm64/utils-arm64.cc",
"src/arm64/utils-arm64.h",
"src/builtins/arm64/builtins-arm64.cc",
"src/compiler/arm64/code-generator-arm64.cc",
"src/compiler/arm64/instruction-codes-arm64.h",
"src/compiler/arm64/instruction-scheduler-arm64.cc",
......@@ -1746,6 +1746,7 @@ v8_source_set("v8_base") {
]
} else if (v8_target_cpu == "mipsel") {
sources += [
"src/builtins/mips/builtins-mips.cc",
"src/compiler/mips/code-generator-mips.cc",
"src/compiler/mips/instruction-codes-mips.h",
"src/compiler/mips/instruction-scheduler-mips.cc",
......@@ -1766,7 +1767,6 @@ v8_source_set("v8_base") {
"src/mips/assembler-mips-inl.h",
"src/mips/assembler-mips.cc",
"src/mips/assembler-mips.h",
"src/mips/builtins-mips.cc",
"src/mips/code-stubs-mips.cc",
"src/mips/code-stubs-mips.h",
"src/mips/codegen-mips.cc",
......@@ -1788,6 +1788,7 @@ v8_source_set("v8_base") {
]
} else if (v8_target_cpu == "mips64el") {
sources += [
"src/builtins/mips64/builtins-mips64.cc",
"src/compiler/mips64/code-generator-mips64.cc",
"src/compiler/mips64/instruction-codes-mips64.h",
"src/compiler/mips64/instruction-scheduler-mips64.cc",
......@@ -1808,7 +1809,6 @@ v8_source_set("v8_base") {
"src/mips64/assembler-mips64-inl.h",
"src/mips64/assembler-mips64.cc",
"src/mips64/assembler-mips64.h",
"src/mips64/builtins-mips64.cc",
"src/mips64/code-stubs-mips64.cc",
"src/mips64/code-stubs-mips64.h",
"src/mips64/codegen-mips64.cc",
......@@ -1830,6 +1830,7 @@ v8_source_set("v8_base") {
]
} else if (v8_target_cpu == "s390" || v8_target_cpu == "s390x") {
sources += [
"src/builtins/s390/builtins-s390.cc",
"src/compiler/s390/code-generator-s390.cc",
"src/compiler/s390/instruction-codes-s390.h",
"src/compiler/s390/instruction-scheduler-s390.cc",
......@@ -1852,7 +1853,6 @@ v8_source_set("v8_base") {
"src/s390/assembler-s390-inl.h",
"src/s390/assembler-s390.cc",
"src/s390/assembler-s390.h",
"src/s390/builtins-s390.cc",
"src/s390/code-stubs-s390.cc",
"src/s390/code-stubs-s390.h",
"src/s390/codegen-s390.cc",
......
src/assembler.cc
View file @ c8a0c0bd
......@@ -43,7 +43,6 @@
#include "src/base/lazy-instance.h"
#include "src/base/platform/platform.h"
#include "src/base/utils/random-number-generator.h"
#include "src/builtins.h"
#include "src/codegen.h"
#include "src/counters.h"
#include "src/debug/debug.h"
......
src/assembler.h
View file @ c8a0c0bd
......@@ -36,7 +36,7 @@
#define V8_ASSEMBLER_H_
#include "src/allocation.h"
#include "src/builtins.h"
#include "src/builtins/builtins.h"
#include "src/isolate.h"
#include "src/log.h"
#include "src/register-configuration.h"
......
src/ast/ast.cc
View file @ c8a0c0bd
......@@ -9,7 +9,7 @@
#include "src/ast/prettyprinter.h"
#include "src/ast/scopes.h"
#include "src/base/hashmap.h"
#include "src/builtins.h"
#include "src/builtins/builtins.h"
#include "src/code-stubs.h"
#include "src/contexts.h"
#include "src/conversions.h"
......
src/builtins.h → src/builtins/builtins.h
View file @ c8a0c0bd
// Copyright 2011 the V8 project authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef V8_BUILTINS_H_
#define V8_BUILTINS_H_
#ifndef V8_BUILTINS_BUILTINS_H_
#define V8_BUILTINS_BUILTINS_H_
#include "src/base/flags.h"
#include "src/handles.h"
......@@ -15,23 +14,22 @@ namespace internal {
// Forward declarations.
class CodeStubAssembler;
#define CODE_AGE_LIST_WITH_ARG(V, A) \
V(Quadragenarian, A) \
V(Quinquagenarian, A) \
V(Sexagenarian, A) \
V(Septuagenarian, A) \
#define CODE_AGE_LIST_WITH_ARG(V, A) \
V(Quadragenarian, A) \
V(Quinquagenarian, A) \
V(Sexagenarian, A) \
V(Septuagenarian, A) \
V(Octogenarian, A)
#define CODE_AGE_LIST_IGNORE_ARG(X, V) V(X)
#define CODE_AGE_LIST(V) \
CODE_AGE_LIST_WITH_ARG(CODE_AGE_LIST_IGNORE_ARG, V)
#define CODE_AGE_LIST(V) CODE_AGE_LIST_WITH_ARG(CODE_AGE_LIST_IGNORE_ARG, V)
#define CODE_AGE_LIST_COMPLETE(V) \
V(ToBeExecutedOnce) \
V(NotExecuted) \
V(ExecutedOnce) \
V(NoAge) \
#define CODE_AGE_LIST_COMPLETE(V) \
V(ToBeExecutedOnce) \
V(NotExecuted) \
V(ExecutedOnce) \
V(NoAge) \
CODE_AGE_LIST_WITH_ARG(CODE_AGE_LIST_IGNORE_ARG, V)
#define DECLARE_CODE_AGE_BUILTIN(C, V) \
......@@ -392,7 +390,6 @@ class CodeStubAssembler;
class BuiltinFunctionTable;
class ObjectVisitor;
class Builtins {
public:
~Builtins();
......@@ -414,15 +411,18 @@ class Builtins {
#define DEF_ENUM_T(name, argc) k##name,
#define DEF_ENUM_S(name, kind, extra, interface_descriptor) k##name,
#define DEF_ENUM_H(name, kind) k##name,
BUILTIN_LIST_C(DEF_ENUM_C) BUILTIN_LIST_A(DEF_ENUM_A)
BUILTIN_LIST_T(DEF_ENUM_T) BUILTIN_LIST_S(DEF_ENUM_S)
BUILTIN_LIST_H(DEF_ENUM_H) BUILTIN_LIST_DEBUG_A(DEF_ENUM_A)
BUILTIN_LIST_C(DEF_ENUM_C)
BUILTIN_LIST_A(DEF_ENUM_A)
BUILTIN_LIST_T(DEF_ENUM_T)
BUILTIN_LIST_S(DEF_ENUM_S)
BUILTIN_LIST_H(DEF_ENUM_H)
BUILTIN_LIST_DEBUG_A(DEF_ENUM_A)
#undef DEF_ENUM_C
#undef DEF_ENUM_A
#undef DEF_ENUM_T
#undef DEF_ENUM_S
#undef DEF_ENUM_H
builtin_count
builtin_count
};
enum CFunctionId {
......@@ -471,9 +471,7 @@ class Builtins {
return reinterpret_cast<Address>(&builtins_[name]);
}
static Address c_function_address(CFunctionId id) {
return c_functions_[id];
}
static Address c_function_address(CFunctionId id) { return c_functions_[id]; }
const char* name(int index) {
DCHECK(index >= 0);
......@@ -821,11 +819,10 @@ class Builtins {
CallableType function_type);
static void Generate_InterpreterPushArgsAndConstruct(MacroAssembler* masm);
#define DECLARE_CODE_AGE_BUILTIN_GENERATOR(C) \
static void Generate_Make##C##CodeYoungAgainEvenMarking( \
MacroAssembler* masm); \
static void Generate_Make##C##CodeYoungAgainOddMarking( \
MacroAssembler* masm);
#define DECLARE_CODE_AGE_BUILTIN_GENERATOR(C) \
static void Generate_Make##C##CodeYoungAgainEvenMarking( \
MacroAssembler* masm); \
static void Generate_Make##C##CodeYoungAgainOddMarking(MacroAssembler* masm);
CODE_AGE_LIST(DECLARE_CODE_AGE_BUILTIN_GENERATOR)
#undef DECLARE_CODE_AGE_BUILTIN_GENERATOR
......@@ -849,4 +846,4 @@ class Builtins {
} // namespace internal
} // namespace v8
#endif // V8_BUILTINS_H_
#endif // V8_BUILTINS_BUILTINS_H_
src/builtins/mips/OWNERS 0 → 100644
View file @ c8a0c0bd
paul.lind@imgtec.com
gergely.kis@imgtec.com
akos.palfi@imgtec.com
balazs.kilvady@imgtec.com
dusan.milosavljevic@imgtec.com
ivica.bogosavljevic@imgtec.com
src/builtins/mips64/OWNERS 0 → 100644
View file @ c8a0c0bd
paul.lind@imgtec.com
gergely.kis@imgtec.com
akos.palfi@imgtec.com
balazs.kilvady@imgtec.com
dusan.milosavljevic@imgtec.com
ivica.bogosavljevic@imgtec.com
src/builtins/ppc/OWNERS 0 → 100644
View file @ c8a0c0bd
jyan@ca.ibm.com
dstence@us.ibm.com
joransiu@ca.ibm.com
mbrandy@us.ibm.com
michael_dawson@ca.ibm.com
bjaideep@ca.ibm.com
src/builtins/s390/OWNERS 0 → 100644
View file @ c8a0c0bd
jyan@ca.ibm.com
dstence@us.ibm.com
joransiu@ca.ibm.com
mbrandy@us.ibm.com
michael_dawson@ca.ibm.com
bjaideep@ca.ibm.com
src/builtins/x87/OWNERS 0 → 100644
View file @ c8a0c0bd
weiliang.lin@intel.com
src/compiler/code-assembler.h
View file @ c8a0c0bd
......@@ -10,7 +10,7 @@
// Clients of this interface shouldn't depend on lots of compiler internals.
// Do not include anything from src/compiler here!
#include "src/allocation.h"
#include "src/builtins.h"
#include "src/builtins/builtins.h"
#include "src/heap/heap.h"
#include "src/machine-type.h"
#include "src/runtime/runtime.h"
......
src/counters.h
View file @ c8a0c0bd
......@@ -9,7 +9,7 @@
#include "src/allocation.h"
#include "src/base/platform/elapsed-timer.h"
#include "src/base/platform/time.h"
#include "src/builtins.h"
#include "src/builtins/builtins.h"
#include "src/globals.h"
#include "src/objects.h"
#include "src/runtime/runtime.h"
......
src/interpreter/interpreter-assembler.h
View file @ c8a0c0bd
......@@ -7,7 +7,7 @@
#include "src/allocation.h"
#include "src/base/smart-pointers.h"
#include "src/builtins.h"
#include "src/builtins/builtins.h"
#include "src/code-stub-assembler.h"
#include "src/frames.h"
#include "src/interpreter/bytecode-register.h"
......
src/interpreter/interpreter-intrinsics.h
View file @ c8a0c0bd
......@@ -7,7 +7,7 @@
#include "src/allocation.h"
#include "src/base/smart-pointers.h"
#include "src/builtins.h"
#include "src/builtins/builtins.h"
#include "src/frames.h"
#include "src/interpreter/bytecodes.h"
#include "src/interpreter/interpreter-assembler.h"
......
src/interpreter/interpreter.h
View file @ c8a0c0bd
......@@ -9,7 +9,7 @@
// Do not include anything from src/interpreter other than
// src/interpreter/bytecodes.h here!
#include "src/base/macros.h"
#include "src/builtins.h"
#include "src/builtins/builtins.h"
#include "src/interpreter/bytecodes.h"
#include "src/parsing/token.h"
#include "src/runtime/runtime.h"
......
src/isolate.h
View file @ c8a0c0bd
......@@ -15,7 +15,7 @@
#include "src/base/accounting-allocator.h"
#include "src/base/atomicops.h"
#include "src/base/hashmap.h"
#include "src/builtins.h"
#include "src/builtins/builtins.h"
#include "src/cancelable-task.h"
#include "src/contexts.h"
#include "src/date.h"
......
src/objects-inl.h
View file @ c8a0c0bd
......@@ -14,7 +14,7 @@
#include "src/base/atomicops.h"
#include "src/base/bits.h"
#include "src/builtins.h"
#include "src/builtins/builtins.h"
#include "src/contexts-inl.h"
#include "src/conversions-inl.h"
#include "src/factory.h"
......
src/objects.h
View file @ c8a0c0bd
......@@ -12,15 +12,15 @@
#include "src/base/bits.h"
#include "src/base/flags.h"
#include "src/base/smart-pointers.h"
#include "src/builtins.h"
#include "src/builtins/builtins.h"
#include "src/checks.h"
#include "src/elements-kind.h"
#include "src/field-index.h"
#include "src/flags.h"
#include "src/list.h"
#include "src/property-details.h"
#include "src/unicode.h"
#include "src/unicode-decoder.h"
#include "src/unicode.h"
#include "src/zone.h"
#if V8_TARGET_ARCH_ARM
......
src/v8.gyp
View file @ c8a0c0bd
......@@ -467,8 +467,8 @@
'bit-vector.h',
'bootstrapper.cc',
'bootstrapper.h',
'builtins.cc',
'builtins.h',
'builtins/builtins.cc',
'builtins/builtins.h',
'cached-powers.cc',
'cached-powers.h',
'cancelable-task.cc',
......@@ -1217,7 +1217,6 @@
'arm/assembler-arm-inl.h',
'arm/assembler-arm.cc',
'arm/assembler-arm.h',
'arm/builtins-arm.cc',
'arm/code-stubs-arm.cc',
'arm/code-stubs-arm.h',
'arm/codegen-arm.cc',
......@@ -1235,6 +1234,7 @@
'arm/macro-assembler-arm.h',
'arm/simulator-arm.cc',
'arm/simulator-arm.h',
'builtins/arm/builtins-arm.cc',
'compiler/arm/code-generator-arm.cc',
'compiler/arm/instruction-codes-arm.h',
'compiler/arm/instruction-scheduler-arm.cc',
......@@ -1261,7 +1261,6 @@
'arm64/assembler-arm64.cc',
'arm64/assembler-arm64.h',
'arm64/assembler-arm64-inl.h',
'arm64/builtins-arm64.cc',
'arm64/codegen-arm64.cc',
'arm64/codegen-arm64.h',
'arm64/code-stubs-arm64.cc',
......@@ -1289,6 +1288,7 @@
'arm64/simulator-arm64.h',
'arm64/utils-arm64.cc',
'arm64/utils-arm64.h',
'builtins/arm64/builtins-arm64.cc',
'compiler/arm64/code-generator-arm64.cc',
'compiler/arm64/instruction-codes-arm64.h',
'compiler/arm64/instruction-scheduler-arm64.cc',
......@@ -1318,7 +1318,6 @@
'ia32/assembler-ia32-inl.h',
'ia32/assembler-ia32.cc',
'ia32/assembler-ia32.h',
'ia32/builtins-ia32.cc',
'ia32/code-stubs-ia32.cc',
'ia32/code-stubs-ia32.h',
'ia32/codegen-ia32.cc',
......@@ -1331,6 +1330,7 @@
'ia32/interface-descriptors-ia32.cc',
'ia32/macro-assembler-ia32.cc',
'ia32/macro-assembler-ia32.h',
'builtins/ia32/builtins-ia32.cc',
'compiler/ia32/code-generator-ia32.cc',
'compiler/ia32/instruction-codes-ia32.h',
'compiler/ia32/instruction-scheduler-ia32.cc',
......@@ -1357,7 +1357,6 @@
'x87/assembler-x87-inl.h',
'x87/assembler-x87.cc',
'x87/assembler-x87.h',
'x87/builtins-x87.cc',
'x87/code-stubs-x87.cc',
'x87/code-stubs-x87.h',
'x87/codegen-x87.cc',
......@@ -1370,6 +1369,7 @@
'x87/interface-descriptors-x87.cc',
'x87/macro-assembler-x87.cc',
'x87/macro-assembler-x87.h',
'builtins/x87/builtins-x87.cc',
'compiler/x87/code-generator-x87.cc',
'compiler/x87/instruction-codes-x87.h',
'compiler/x87/instruction-scheduler-x87.cc',
......@@ -1396,7 +1396,6 @@
'mips/assembler-mips.cc',
'mips/assembler-mips.h',
'mips/assembler-mips-inl.h',
'mips/builtins-mips.cc',
'mips/codegen-mips.cc',
'mips/codegen-mips.h',
'mips/code-stubs-mips.cc',
......@@ -1413,6 +1412,7 @@
'mips/macro-assembler-mips.h',
'mips/simulator-mips.cc',
'mips/simulator-mips.h',
'builtins/mips/builtins-mips.cc',
'compiler/mips/code-generator-mips.cc',
'compiler/mips/instruction-codes-mips.h',
'compiler/mips/instruction-scheduler-mips.cc',
......@@ -1439,7 +1439,6 @@
'mips64/assembler-mips64.cc',
'mips64/assembler-mips64.h',
'mips64/assembler-mips64-inl.h',
'mips64/builtins-mips64.cc',
'mips64/codegen-mips64.cc',
'mips64/codegen-mips64.h',
'mips64/code-stubs-mips64.cc',
......@@ -1456,6 +1455,7 @@
'mips64/macro-assembler-mips64.h',
'mips64/simulator-mips64.cc',
'mips64/simulator-mips64.h',
'builtins/mips64/builtins-mips64.cc',
'compiler/mips64/code-generator-mips64.cc',
'compiler/mips64/instruction-codes-mips64.h',
'compiler/mips64/instruction-scheduler-mips64.cc',
......@@ -1479,6 +1479,7 @@
}],
['v8_target_arch=="x64" or v8_target_arch=="x32"', {
'sources': [ ### gcmole(arch:x64) ###
'builtins/x64/builtins-x64.cc',
'crankshaft/x64/lithium-codegen-x64.cc',
'crankshaft/x64/lithium-codegen-x64.h',
'crankshaft/x64/lithium-gap-resolver-x64.cc',
......@@ -1488,7 +1489,6 @@
'x64/assembler-x64-inl.h',
'x64/assembler-x64.cc',
'x64/assembler-x64.h',
'x64/builtins-x64.cc',
'x64/code-stubs-x64.cc',
'x64/code-stubs-x64.h',
'x64/codegen-x64.cc',
......@@ -1522,6 +1522,7 @@
}],
['v8_target_arch=="ppc" or v8_target_arch=="ppc64"', {
'sources': [ ### gcmole(arch:ppc) ###
'builtins/ppc/builtins-ppc.cc',
'compiler/ppc/code-generator-ppc.cc',
'compiler/ppc/instruction-codes-ppc.h',
'compiler/ppc/instruction-scheduler-ppc.cc',
......@@ -1542,7 +1543,6 @@
'ppc/assembler-ppc-inl.h',
'ppc/assembler-ppc.cc',
'ppc/assembler-ppc.h',
'ppc/builtins-ppc.cc',
'ppc/code-stubs-ppc.cc',
'ppc/code-stubs-ppc.h',
'ppc/codegen-ppc.cc',
......@@ -1565,6 +1565,7 @@
}],
['v8_target_arch=="s390" or v8_target_arch=="s390x"', {
'sources': [ ### gcmole(arch:s390) ###
'builtins/s390/builtins-s390.cc',
'compiler/s390/code-generator-s390.cc',
'compiler/s390/instruction-codes-s390.h',
'compiler/s390/instruction-scheduler-s390.cc',
......@@ -1587,7 +1588,6 @@
's390/assembler-s390.cc',
's390/assembler-s390.h',
's390/assembler-s390-inl.h',
's390/builtins-s390.cc',
's390/codegen-s390.cc',
's390/codegen-s390.h',
's390/code-stubs-s390.cc',
......
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