Index: tools/gyp/v8.gyp |
diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp |
index 0e05b3edaa9c7eecbf9e16317ea1f4a46ac65f4f..fc9e2812a548bd2b57e5ed0d89148cb274c39c07 100644 |
--- a/tools/gyp/v8.gyp |
+++ b/tools/gyp/v8.gyp |
@@ -421,7 +421,6 @@ |
'../../src/bootstrapper.h', |
'../../src/builtins.cc', |
'../../src/builtins.h', |
- '../../src/bytecodes-irregexp.h', |
'../../src/cached-powers.cc', |
'../../src/cached-powers.h', |
'../../src/cancelable-task.cc', |
@@ -798,8 +797,6 @@ |
'../../src/ic/ic-compiler.h', |
'../../src/interface-descriptors.cc', |
'../../src/interface-descriptors.h', |
- '../../src/interpreter-irregexp.cc', |
- '../../src/interpreter-irregexp.h', |
'../../src/interpreter/bytecodes.cc', |
'../../src/interpreter/bytecodes.h', |
'../../src/interpreter/bytecode-array-builder.cc', |
@@ -810,9 +807,6 @@ |
'../../src/isolate.h', |
'../../src/json-parser.h', |
'../../src/json-stringifier.h', |
- '../../src/jsregexp-inl.h', |
- '../../src/jsregexp.cc', |
- '../../src/jsregexp.h', |
'../../src/layout-descriptor-inl.h', |
'../../src/layout-descriptor.cc', |
'../../src/layout-descriptor.h', |
@@ -868,15 +862,21 @@ |
'../../src/property.cc', |
'../../src/property.h', |
'../../src/prototype.h', |
- '../../src/regexp-macro-assembler-irregexp-inl.h', |
- '../../src/regexp-macro-assembler-irregexp.cc', |
- '../../src/regexp-macro-assembler-irregexp.h', |
- '../../src/regexp-macro-assembler-tracer.cc', |
- '../../src/regexp-macro-assembler-tracer.h', |
- '../../src/regexp-macro-assembler.cc', |
- '../../src/regexp-macro-assembler.h', |
- '../../src/regexp-stack.cc', |
- '../../src/regexp-stack.h', |
+ '../../src/regexp/bytecodes-irregexp.h', |
+ '../../src/regexp/interpreter-irregexp.cc', |
+ '../../src/regexp/interpreter-irregexp.h', |
+ '../../src/regexp/jsregexp-inl.h', |
+ '../../src/regexp/jsregexp.cc', |
+ '../../src/regexp/jsregexp.h', |
+ '../../src/regexp/regexp-macro-assembler-irregexp-inl.h', |
+ '../../src/regexp/regexp-macro-assembler-irregexp.cc', |
+ '../../src/regexp/regexp-macro-assembler-irregexp.h', |
+ '../../src/regexp/regexp-macro-assembler-tracer.cc', |
+ '../../src/regexp/regexp-macro-assembler-tracer.h', |
+ '../../src/regexp/regexp-macro-assembler.cc', |
+ '../../src/regexp/regexp-macro-assembler.h', |
+ '../../src/regexp/regexp-stack.cc', |
+ '../../src/regexp/regexp-stack.h', |
'../../src/rewriter.cc', |
'../../src/rewriter.h', |
'../../src/runtime-profiler.cc', |
@@ -1026,8 +1026,6 @@ |
'../../src/arm/lithium-gap-resolver-arm.h', |
'../../src/arm/macro-assembler-arm.cc', |
'../../src/arm/macro-assembler-arm.h', |
- '../../src/arm/regexp-macro-assembler-arm.cc', |
- '../../src/arm/regexp-macro-assembler-arm.h', |
'../../src/arm/simulator-arm.cc', |
'../../src/arm/simulator-arm.h', |
'../../src/compiler/arm/code-generator-arm.cc', |
@@ -1040,6 +1038,8 @@ |
'../../src/ic/arm/ic-arm.cc', |
'../../src/ic/arm/ic-compiler-arm.cc', |
'../../src/ic/arm/stub-cache-arm.cc', |
+ '../../src/regexp/arm/regexp-macro-assembler-arm.cc', |
+ '../../src/regexp/arm/regexp-macro-assembler-arm.h', |
], |
}], |
['v8_target_arch=="arm64"', { |
@@ -1080,8 +1080,6 @@ |
'../../src/arm64/macro-assembler-arm64.cc', |
'../../src/arm64/macro-assembler-arm64.h', |
'../../src/arm64/macro-assembler-arm64-inl.h', |
- '../../src/arm64/regexp-macro-assembler-arm64.cc', |
- '../../src/arm64/regexp-macro-assembler-arm64.h', |
'../../src/arm64/simulator-arm64.cc', |
'../../src/arm64/simulator-arm64.h', |
'../../src/arm64/utils-arm64.cc', |
@@ -1096,6 +1094,8 @@ |
'../../src/ic/arm64/ic-arm64.cc', |
'../../src/ic/arm64/ic-compiler-arm64.cc', |
'../../src/ic/arm64/stub-cache-arm64.cc', |
+ '../../src/regexp/arm64/regexp-macro-assembler-arm64.cc', |
+ '../../src/regexp/arm64/regexp-macro-assembler-arm64.h', |
], |
}], |
['v8_target_arch=="ia32"', { |
@@ -1122,8 +1122,6 @@ |
'../../src/ia32/lithium-ia32.h', |
'../../src/ia32/macro-assembler-ia32.cc', |
'../../src/ia32/macro-assembler-ia32.h', |
- '../../src/ia32/regexp-macro-assembler-ia32.cc', |
- '../../src/ia32/regexp-macro-assembler-ia32.h', |
'../../src/compiler/ia32/code-generator-ia32.cc', |
'../../src/compiler/ia32/instruction-codes-ia32.h', |
'../../src/compiler/ia32/instruction-selector-ia32.cc', |
@@ -1134,6 +1132,8 @@ |
'../../src/ic/ia32/ic-ia32.cc', |
'../../src/ic/ia32/ic-compiler-ia32.cc', |
'../../src/ic/ia32/stub-cache-ia32.cc', |
+ '../../src/regexp/ia32/regexp-macro-assembler-ia32.cc', |
+ '../../src/regexp/ia32/regexp-macro-assembler-ia32.h', |
], |
}], |
['v8_target_arch=="x87"', { |
@@ -1160,8 +1160,6 @@ |
'../../src/x87/lithium-x87.h', |
'../../src/x87/macro-assembler-x87.cc', |
'../../src/x87/macro-assembler-x87.h', |
- '../../src/x87/regexp-macro-assembler-x87.cc', |
- '../../src/x87/regexp-macro-assembler-x87.h', |
'../../src/compiler/x87/code-generator-x87.cc', |
'../../src/compiler/x87/instruction-codes-x87.h', |
'../../src/compiler/x87/instruction-selector-x87.cc', |
@@ -1172,6 +1170,8 @@ |
'../../src/ic/x87/ic-x87.cc', |
'../../src/ic/x87/ic-compiler-x87.cc', |
'../../src/ic/x87/stub-cache-x87.cc', |
+ '../../src/regexp/x87/regexp-macro-assembler-x87.cc', |
+ '../../src/regexp/x87/regexp-macro-assembler-x87.h', |
], |
}], |
['v8_target_arch=="mips" or v8_target_arch=="mipsel"', { |
@@ -1200,8 +1200,6 @@ |
'../../src/mips/lithium-mips.h', |
'../../src/mips/macro-assembler-mips.cc', |
'../../src/mips/macro-assembler-mips.h', |
- '../../src/mips/regexp-macro-assembler-mips.cc', |
- '../../src/mips/regexp-macro-assembler-mips.h', |
'../../src/mips/simulator-mips.cc', |
'../../src/mips/simulator-mips.h', |
'../../src/compiler/mips/code-generator-mips.cc', |
@@ -1214,6 +1212,8 @@ |
'../../src/ic/mips/ic-mips.cc', |
'../../src/ic/mips/ic-compiler-mips.cc', |
'../../src/ic/mips/stub-cache-mips.cc', |
+ '../../src/regexp/mips/regexp-macro-assembler-mips.cc', |
+ '../../src/regexp/mips/regexp-macro-assembler-mips.h', |
], |
}], |
['v8_target_arch=="mips64el"', { |
@@ -1242,8 +1242,6 @@ |
'../../src/mips64/lithium-mips64.h', |
'../../src/mips64/macro-assembler-mips64.cc', |
'../../src/mips64/macro-assembler-mips64.h', |
- '../../src/mips64/regexp-macro-assembler-mips64.cc', |
- '../../src/mips64/regexp-macro-assembler-mips64.h', |
'../../src/mips64/simulator-mips64.cc', |
'../../src/mips64/simulator-mips64.h', |
'../../src/compiler/mips64/code-generator-mips64.cc', |
@@ -1256,6 +1254,8 @@ |
'../../src/ic/mips64/ic-mips64.cc', |
'../../src/ic/mips64/ic-compiler-mips64.cc', |
'../../src/ic/mips64/stub-cache-mips64.cc', |
+ '../../src/regexp/mips64/regexp-macro-assembler-mips64.cc', |
+ '../../src/regexp/mips64/regexp-macro-assembler-mips64.h', |
], |
}], |
['v8_target_arch=="x64" or v8_target_arch=="x32"', { |
@@ -1282,8 +1282,6 @@ |
'../../src/x64/lithium-x64.h', |
'../../src/x64/macro-assembler-x64.cc', |
'../../src/x64/macro-assembler-x64.h', |
- '../../src/x64/regexp-macro-assembler-x64.cc', |
- '../../src/x64/regexp-macro-assembler-x64.h', |
'../../src/debug/x64/debug-x64.cc', |
'../../src/full-codegen/x64/full-codegen-x64.cc', |
'../../src/ic/x64/access-compiler-x64.cc', |
@@ -1291,6 +1289,8 @@ |
'../../src/ic/x64/ic-x64.cc', |
'../../src/ic/x64/ic-compiler-x64.cc', |
'../../src/ic/x64/stub-cache-x64.cc', |
+ '../../src/regexp/x64/regexp-macro-assembler-x64.cc', |
+ '../../src/regexp/x64/regexp-macro-assembler-x64.h', |
], |
}], |
['v8_target_arch=="x64"', { |
@@ -1327,8 +1327,6 @@ |
'../../src/ppc/lithium-gap-resolver-ppc.h', |
'../../src/ppc/macro-assembler-ppc.cc', |
'../../src/ppc/macro-assembler-ppc.h', |
- '../../src/ppc/regexp-macro-assembler-ppc.cc', |
- '../../src/ppc/regexp-macro-assembler-ppc.h', |
'../../src/ppc/simulator-ppc.cc', |
'../../src/ppc/simulator-ppc.h', |
'../../src/compiler/ppc/code-generator-ppc.cc', |
@@ -1341,6 +1339,8 @@ |
'../../src/ic/ppc/ic-ppc.cc', |
'../../src/ic/ppc/ic-compiler-ppc.cc', |
'../../src/ic/ppc/stub-cache-ppc.cc', |
+ '../../src/regexp/ppc/regexp-macro-assembler-ppc.cc', |
+ '../../src/regexp/ppc/regexp-macro-assembler-ppc.h', |
], |
}], |
['OS=="win"', { |