From 1667c15e373fd6958e2d70729382d87d91843e52 Mon Sep 17 00:00:00 2001 From: yangguo Date: Fri, 31 Jul 2015 04:07:50 -0700 Subject: [PATCH] Debugger: move implementation to a separate folder. R=cbruni@chromium.org Review URL: https://codereview.chromium.org/1265923002 Cr-Commit-Position: refs/heads/master@{#29951} --- BUILD.gn | 26 ++++++++++----------- WATCHLISTS | 2 +- src/api.cc | 2 +- src/arm/assembler-arm-inl.h | 2 +- src/arm/builtins-arm.cc | 2 +- src/arm/macro-assembler-arm.cc | 2 +- src/arm64/assembler-arm64-inl.h | 2 +- src/arm64/builtins-arm64.cc | 2 +- src/arm64/macro-assembler-arm64.cc | 2 +- src/assembler.cc | 2 +- src/assert-scope.cc | 2 +- src/background-parsing-task.cc | 2 +- src/codegen.cc | 2 +- src/compiler.cc | 4 ++-- src/contexts.cc | 2 +- src/debug/OWNERS | 4 ++++ src/debug/arm/OWNERS | 1 + src/{ => debug}/arm/debug-arm.cc | 2 +- src/debug/arm64/OWNERS | 1 + src/{ => debug}/arm64/debug-arm64.cc | 2 +- src/{ => debug}/debug.cc | 9 ++++---- src/{ => debug}/debug.h | 10 ++++----- src/{debug-debugger.js => debug/debug.js} | 0 src/{ => debug}/ia32/debug-ia32.cc | 2 +- src/{ => debug}/liveedit.cc | 4 ++-- src/{ => debug}/liveedit.h | 9 ++++---- src/{liveedit-debugger.js => debug/liveedit.js} | 2 +- src/debug/mips/OWNERS | 5 +++++ src/{ => debug}/mips/debug-mips.cc | 2 +- src/debug/mips64/OWNERS | 5 +++++ src/{ => debug}/mips64/debug-mips64.cc | 2 +- src/{mirror-debugger.js => debug/mirrors.js} | 0 src/debug/ppc/OWNERS | 5 +++++ src/{ => debug}/ppc/debug-ppc.cc | 2 +- src/{ => debug}/x64/debug-x64.cc | 2 +- src/debug/x87/OWNERS | 1 + src/{ => debug}/x87/debug-x87.cc | 2 +- src/disassembler.cc | 2 +- src/full-codegen/arm/full-codegen-arm.cc | 2 +- src/full-codegen/arm64/full-codegen-arm64.cc | 2 +- src/full-codegen/full-codegen.cc | 4 ++-- src/full-codegen/ia32/full-codegen-ia32.cc | 2 +- src/full-codegen/mips/full-codegen-mips.cc | 2 +- src/full-codegen/mips64/full-codegen-mips64.cc | 2 +- src/full-codegen/ppc/full-codegen-ppc.cc | 2 +- src/full-codegen/x64/full-codegen-x64.cc | 2 +- src/full-codegen/x87/full-codegen-x87.cc | 2 +- src/heap-snapshot-generator.cc | 2 +- src/heap/heap.cc | 2 +- src/ia32/assembler-ia32-inl.h | 2 +- src/ia32/macro-assembler-ia32.cc | 2 +- src/ic/ic-inl.h | 2 +- src/isolate.cc | 2 +- src/mips/assembler-mips-inl.h | 2 +- src/mips/builtins-mips.cc | 2 +- src/mips/macro-assembler-mips.cc | 2 +- src/mips64/assembler-mips64-inl.h | 2 +- src/mips64/builtins-mips64.cc | 2 +- src/mips64/macro-assembler-mips64.cc | 2 +- src/objects.cc | 2 +- src/pending-compilation-error-handler.cc | 2 +- src/ppc/assembler-ppc-inl.h | 2 +- src/ppc/builtins-ppc.cc | 2 +- src/ppc/macro-assembler-ppc.cc | 2 +- src/profile-generator.cc | 2 +- src/property-details.h | 2 +- src/runtime/runtime-classes.cc | 2 +- src/runtime/runtime-debug.cc | 2 +- src/runtime/runtime-internal.cc | 2 +- src/runtime/runtime-liveedit.cc | 4 ++-- src/runtime/runtime-object.cc | 2 +- src/runtime/runtime-observe.cc | 2 +- src/v8.cc | 2 +- src/v8threads.cc | 2 +- src/x64/assembler-x64-inl.h | 2 +- src/x64/macro-assembler-x64.cc | 2 +- src/x87/assembler-x87-inl.h | 2 +- src/x87/macro-assembler-x87.cc | 2 +- test/cctest/cctest.cc | 2 +- test/cctest/test-api.cc | 2 +- test/cctest/test-debug.cc | 2 +- test/cctest/test-deoptimization.cc | 2 +- test/cctest/test-dictionary.cc | 2 +- test/cctest/test-disasm-arm.cc | 2 +- test/cctest/test-disasm-ia32.cc | 2 +- test/cctest/test-disasm-mips.cc | 2 +- test/cctest/test-disasm-mips64.cc | 2 +- test/cctest/test-disasm-ppc.cc | 2 +- test/cctest/test-disasm-x64.cc | 2 +- test/cctest/test-disasm-x87.cc | 2 +- test/cctest/test-feedback-vector.cc | 2 +- test/cctest/test-func-name-inference.cc | 2 +- test/cctest/test-heap-profiler.cc | 2 +- test/cctest/test-liveedit.cc | 2 +- test/cctest/test-serialize.cc | 2 +- test/mjsunit/debug-function-scopes.js | 2 +- test/mjsunit/es6/debug-function-scopes.js | 2 +- test/unittests/test-utils.cc | 2 +- tools/gyp/v8.gyp | 30 ++++++++++++------------- tools/js2c.py | 4 ++-- 100 files changed, 155 insertions(+), 133 deletions(-) create mode 100644 src/debug/OWNERS create mode 100644 src/debug/arm/OWNERS rename src/{ => debug}/arm/debug-arm.cc (99%) create mode 100644 src/debug/arm64/OWNERS rename src/{ => debug}/arm64/debug-arm64.cc (99%) rename src/{ => debug}/debug.cc (99%) rename src/{ => debug}/debug.h (99%) rename src/{debug-debugger.js => debug/debug.js} (100%) rename src/{ => debug}/ia32/debug-ia32.cc (99%) rename src/{ => debug}/liveedit.cc (99%) rename src/{ => debug}/liveedit.h (99%) rename src/{liveedit-debugger.js => debug/liveedit.js} (99%) create mode 100644 src/debug/mips/OWNERS rename src/{ => debug}/mips/debug-mips.cc (99%) create mode 100644 src/debug/mips64/OWNERS rename src/{ => debug}/mips64/debug-mips64.cc (99%) rename src/{mirror-debugger.js => debug/mirrors.js} (100%) create mode 100644 src/debug/ppc/OWNERS rename src/{ => debug}/ppc/debug-ppc.cc (99%) rename src/{ => debug}/x64/debug-x64.cc (99%) create mode 100644 src/debug/x87/OWNERS rename src/{ => debug}/x87/debug-x87.cc (99%) diff --git a/BUILD.gn b/BUILD.gn index 1619d77..d194d63 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -227,12 +227,12 @@ action("js2c") { "src/json.js", "src/array-iterator.js", "src/string-iterator.js", - "src/debug-debugger.js", - "src/mirror-debugger.js", - "src/liveedit-debugger.js", "src/templates.js", "src/harmony-array.js", "src/harmony-typedarray.js", + "src/debug/debug.js", + "src/debug/mirrors.js", + "src/debug/liveedit.js", ] outputs = [ @@ -834,8 +834,10 @@ source_set("v8_base") { "src/dateparser-inl.h", "src/dateparser.cc", "src/dateparser.h", - "src/debug.cc", - "src/debug.h", + "src/debug/debug.cc", + "src/debug/debug.h", + "src/debug/liveedit.cc", + "src/debug/liveedit.h", "src/deoptimizer.cc", "src/deoptimizer.h", "src/disasm.h", @@ -1021,8 +1023,6 @@ source_set("v8_base") { "src/lithium-codegen.h", "src/lithium.cc", "src/lithium.h", - "src/liveedit.cc", - "src/liveedit.h", "src/log-inl.h", "src/log-utils.cc", "src/log-utils.h", @@ -1199,7 +1199,6 @@ source_set("v8_base") { "src/ia32/codegen-ia32.cc", "src/ia32/codegen-ia32.h", "src/ia32/cpu-ia32.cc", - "src/ia32/debug-ia32.cc", "src/ia32/deoptimizer-ia32.cc", "src/ia32/disasm-ia32.cc", "src/ia32/frames-ia32.cc", @@ -1219,6 +1218,7 @@ source_set("v8_base") { "src/compiler/ia32/instruction-codes-ia32.h", "src/compiler/ia32/instruction-selector-ia32.cc", "src/compiler/ia32/linkage-ia32.cc", + "src/debug/ia32/debug-ia32.cc", "src/full-codegen/ia32/full-codegen-ia32.cc", "src/ic/ia32/access-compiler-ia32.cc", "src/ic/ia32/handler-compiler-ia32.cc", @@ -1237,7 +1237,6 @@ source_set("v8_base") { "src/x64/codegen-x64.cc", "src/x64/codegen-x64.h", "src/x64/cpu-x64.cc", - "src/x64/debug-x64.cc", "src/x64/deoptimizer-x64.cc", "src/x64/disasm-x64.cc", "src/x64/frames-x64.cc", @@ -1257,6 +1256,7 @@ source_set("v8_base") { "src/compiler/x64/instruction-codes-x64.h", "src/compiler/x64/instruction-selector-x64.cc", "src/compiler/x64/linkage-x64.cc", + "src/debug/x64/debug-x64.cc", "src/full-codegen/x64/full-codegen-x64.cc", "src/ic/x64/access-compiler-x64.cc", "src/ic/x64/handler-compiler-x64.cc", @@ -1277,7 +1277,6 @@ source_set("v8_base") { "src/arm/constants-arm.h", "src/arm/constants-arm.cc", "src/arm/cpu-arm.cc", - "src/arm/debug-arm.cc", "src/arm/deoptimizer-arm.cc", "src/arm/disasm-arm.cc", "src/arm/frames-arm.cc", @@ -1300,6 +1299,7 @@ source_set("v8_base") { "src/compiler/arm/instruction-codes-arm.h", "src/compiler/arm/instruction-selector-arm.cc", "src/compiler/arm/linkage-arm.cc", + "src/debug/arm/debug-arm.cc", "src/full-codegen/arm/full-codegen-arm.cc", "src/ic/arm/access-compiler-arm.cc", "src/ic/arm/handler-compiler-arm.cc", @@ -1319,7 +1319,6 @@ source_set("v8_base") { "src/arm64/code-stubs-arm64.h", "src/arm64/constants-arm64.h", "src/arm64/cpu-arm64.cc", - "src/arm64/debug-arm64.cc", "src/arm64/decoder-arm64.cc", "src/arm64/decoder-arm64.h", "src/arm64/decoder-arm64-inl.h", @@ -1353,6 +1352,7 @@ source_set("v8_base") { "src/compiler/arm64/instruction-codes-arm64.h", "src/compiler/arm64/instruction-selector-arm64.cc", "src/compiler/arm64/linkage-arm64.cc", + "src/debug/arm64/debug-arm64.cc", "src/full-codegen/arm64/full-codegen-arm64.cc", "src/ic/arm64/access-compiler-arm64.cc", "src/ic/arm64/handler-compiler-arm64.cc", @@ -1373,7 +1373,6 @@ source_set("v8_base") { "src/mips/constants-mips.cc", "src/mips/constants-mips.h", "src/mips/cpu-mips.cc", - "src/mips/debug-mips.cc", "src/mips/deoptimizer-mips.cc", "src/mips/disasm-mips.cc", "src/mips/frames-mips.cc", @@ -1395,6 +1394,7 @@ source_set("v8_base") { "src/compiler/mips/instruction-codes-mips.h", "src/compiler/mips/instruction-selector-mips.cc", "src/compiler/mips/linkage-mips.cc", + "src/debug/mips/debug-mips.cc", "src/full-codegen/mips/full-codegen-mips.cc", "src/ic/mips/access-compiler-mips.cc", "src/ic/mips/handler-compiler-mips.cc", @@ -1415,7 +1415,6 @@ source_set("v8_base") { "src/mips64/constants-mips64.cc", "src/mips64/constants-mips64.h", "src/mips64/cpu-mips64.cc", - "src/mips64/debug-mips64.cc", "src/mips64/deoptimizer-mips64.cc", "src/mips64/disasm-mips64.cc", "src/mips64/frames-mips64.cc", @@ -1433,6 +1432,7 @@ source_set("v8_base") { "src/mips64/regexp-macro-assembler-mips64.h", "src/mips64/simulator-mips64.cc", "src/mips64/simulator-mips64.h", + "src/debug/mips64/debug-mips64.cc", "src/full-codegen/mips64/full-codegen-mips64.cc", "src/ic/mips64/access-compiler-mips64.cc", "src/ic/mips64/handler-compiler-mips64.cc", diff --git a/WATCHLISTS b/WATCHLISTS index 64771bc..f57dfa1 100644 --- a/WATCHLISTS +++ b/WATCHLISTS @@ -40,7 +40,7 @@ 'filepath': 'src/snapshot/', }, 'debugger': { - 'filepath': 'src/debug\.(cc|h)|src/.*-debugger\.js|src/runtime/runtime-debug\.cc', + 'filepath': 'src/debug/', }, }, diff --git a/src/api.cc b/src/api.cc index 74970e8..586fd86 100644 --- a/src/api.cc +++ b/src/api.cc @@ -26,7 +26,7 @@ #include "src/conversions-inl.h" #include "src/counters.h" #include "src/cpu-profiler.h" -#include "src/debug.h" +#include "src/debug/debug.h" #include "src/deoptimizer.h" #include "src/execution.h" #include "src/global-handles.h" diff --git a/src/arm/assembler-arm-inl.h b/src/arm/assembler-arm-inl.h index 73bf4bb..523000e 100644 --- a/src/arm/assembler-arm-inl.h +++ b/src/arm/assembler-arm-inl.h @@ -40,7 +40,7 @@ #include "src/arm/assembler-arm.h" #include "src/assembler.h" -#include "src/debug.h" +#include "src/debug/debug.h" namespace v8 { diff --git a/src/arm/builtins-arm.cc b/src/arm/builtins-arm.cc index 5006613..b33a195 100644 --- a/src/arm/builtins-arm.cc +++ b/src/arm/builtins-arm.cc @@ -7,7 +7,7 @@ #if V8_TARGET_ARCH_ARM #include "src/codegen.h" -#include "src/debug.h" +#include "src/debug/debug.h" #include "src/deoptimizer.h" #include "src/full-codegen/full-codegen.h" #include "src/interpreter/bytecodes.h" diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc index 7b7d193..feeba98 100644 --- a/src/arm/macro-assembler-arm.cc +++ b/src/arm/macro-assembler-arm.cc @@ -13,7 +13,7 @@ #include "src/bootstrapper.h" #include "src/codegen.h" #include "src/cpu-profiler.h" -#include "src/debug.h" +#include "src/debug/debug.h" #include "src/runtime/runtime.h" namespace v8 { diff --git a/src/arm64/assembler-arm64-inl.h b/src/arm64/assembler-arm64-inl.h index 729a5d0..9fc89c3 100644 --- a/src/arm64/assembler-arm64-inl.h +++ b/src/arm64/assembler-arm64-inl.h @@ -7,7 +7,7 @@ #include "src/arm64/assembler-arm64.h" #include "src/assembler.h" -#include "src/debug.h" +#include "src/debug/debug.h" namespace v8 { diff --git a/src/arm64/builtins-arm64.cc b/src/arm64/builtins-arm64.cc index b99431e..d93b5ad 100644 --- a/src/arm64/builtins-arm64.cc +++ b/src/arm64/builtins-arm64.cc @@ -7,7 +7,7 @@ #if V8_TARGET_ARCH_ARM64 #include "src/codegen.h" -#include "src/debug.h" +#include "src/debug/debug.h" #include "src/deoptimizer.h" #include "src/full-codegen/full-codegen.h" #include "src/runtime/runtime.h" diff --git a/src/arm64/macro-assembler-arm64.cc b/src/arm64/macro-assembler-arm64.cc index e754241..e43ffac 100644 --- a/src/arm64/macro-assembler-arm64.cc +++ b/src/arm64/macro-assembler-arm64.cc @@ -11,7 +11,7 @@ #include "src/bootstrapper.h" #include "src/codegen.h" #include "src/cpu-profiler.h" -#include "src/debug.h" +#include "src/debug/debug.h" #include "src/runtime/runtime.h" namespace v8 { diff --git a/src/assembler.cc b/src/assembler.cc index 20a172b..363e604 100644 --- a/src/assembler.cc +++ b/src/assembler.cc @@ -45,7 +45,7 @@ #include "src/codegen.h" #include "src/counters.h" #include "src/cpu-profiler.h" -#include "src/debug.h" +#include "src/debug/debug.h" #include "src/deoptimizer.h" #include "src/execution.h" #include "src/ic/ic.h" diff --git a/src/assert-scope.cc b/src/assert-scope.cc index 3b91cf4..6cc2e5a 100644 --- a/src/assert-scope.cc +++ b/src/assert-scope.cc @@ -6,7 +6,7 @@ #include "src/base/lazy-instance.h" #include "src/base/platform/platform.h" -#include "src/debug.h" +#include "src/debug/debug.h" #include "src/isolate.h" #include "src/utils.h" diff --git a/src/background-parsing-task.cc b/src/background-parsing-task.cc index c0dba93..cc80e01 100644 --- a/src/background-parsing-task.cc +++ b/src/background-parsing-task.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "src/background-parsing-task.h" -#include "src/debug.h" +#include "src/debug/debug.h" namespace v8 { namespace internal { diff --git a/src/codegen.cc b/src/codegen.cc index 3e1b93d..6eb1ff1 100644 --- a/src/codegen.cc +++ b/src/codegen.cc @@ -11,7 +11,7 @@ #include "src/codegen.h" #include "src/compiler.h" #include "src/cpu-profiler.h" -#include "src/debug.h" +#include "src/debug/debug.h" #include "src/parser.h" #include "src/prettyprinter.h" #include "src/rewriter.h" diff --git a/src/compiler.cc b/src/compiler.cc index 1815c9a..7f060dc 100644 --- a/src/compiler.cc +++ b/src/compiler.cc @@ -12,13 +12,13 @@ #include "src/compilation-cache.h" #include "src/compiler/pipeline.h" #include "src/cpu-profiler.h" -#include "src/debug.h" +#include "src/debug/debug.h" +#include "src/debug/liveedit.h" #include "src/deoptimizer.h" #include "src/full-codegen/full-codegen.h" #include "src/gdb-jit.h" #include "src/hydrogen.h" #include "src/lithium.h" -#include "src/liveedit.h" #include "src/messages.h" #include "src/parser.h" #include "src/prettyprinter.h" diff --git a/src/contexts.cc b/src/contexts.cc index 31ce98c..8263269 100644 --- a/src/contexts.cc +++ b/src/contexts.cc @@ -5,7 +5,7 @@ #include "src/v8.h" #include "src/bootstrapper.h" -#include "src/debug.h" +#include "src/debug/debug.h" #include "src/scopeinfo.h" namespace v8 { diff --git a/src/debug/OWNERS b/src/debug/OWNERS new file mode 100644 index 0000000..03c3e33 --- /dev/null +++ b/src/debug/OWNERS @@ -0,0 +1,4 @@ +mvstanton@chromium.org +ulan@chromium.org +verwaest@chromium.org +yangguo@chromium.org diff --git a/src/debug/arm/OWNERS b/src/debug/arm/OWNERS new file mode 100644 index 0000000..906a5ce --- /dev/null +++ b/src/debug/arm/OWNERS @@ -0,0 +1 @@ +rmcilroy@chromium.org diff --git a/src/arm/debug-arm.cc b/src/debug/arm/debug-arm.cc similarity index 99% rename from src/arm/debug-arm.cc rename to src/debug/arm/debug-arm.cc index d2b9a80..38aadce 100644 --- a/src/arm/debug-arm.cc +++ b/src/debug/arm/debug-arm.cc @@ -7,7 +7,7 @@ #if V8_TARGET_ARCH_ARM #include "src/codegen.h" -#include "src/debug.h" +#include "src/debug/debug.h" namespace v8 { namespace internal { diff --git a/src/debug/arm64/OWNERS b/src/debug/arm64/OWNERS new file mode 100644 index 0000000..906a5ce --- /dev/null +++ b/src/debug/arm64/OWNERS @@ -0,0 +1 @@ +rmcilroy@chromium.org diff --git a/src/arm64/debug-arm64.cc b/src/debug/arm64/debug-arm64.cc similarity index 99% rename from src/arm64/debug-arm64.cc rename to src/debug/arm64/debug-arm64.cc index 8290ce4..e33c1a5 100644 --- a/src/arm64/debug-arm64.cc +++ b/src/debug/arm64/debug-arm64.cc @@ -7,7 +7,7 @@ #if V8_TARGET_ARCH_ARM64 #include "src/codegen.h" -#include "src/debug.h" +#include "src/debug/debug.h" namespace v8 { namespace internal { diff --git a/src/debug.cc b/src/debug/debug.cc similarity index 99% rename from src/debug.cc rename to src/debug/debug.cc index 38d9f47..891c92e 100644 --- a/src/debug.cc +++ b/src/debug/debug.cc @@ -4,6 +4,8 @@ #include "src/v8.h" +#include "src/debug/debug.h" + #include "src/api.h" #include "src/arguments.h" #include "src/bootstrapper.h" @@ -11,7 +13,6 @@ #include "src/codegen.h" #include "src/compilation-cache.h" #include "src/compiler.h" -#include "src/debug.h" #include "src/deoptimizer.h" #include "src/execution.h" #include "src/full-codegen/full-codegen.h" @@ -525,7 +526,7 @@ bool Debug::Load() { // Compile the JavaScript for the debugger in the debugger context. bool caught_exception = - !CompileDebuggerScript(isolate_, Natives::GetIndex("mirror")) || + !CompileDebuggerScript(isolate_, Natives::GetIndex("mirrors")) || !CompileDebuggerScript(isolate_, Natives::GetIndex("debug")); if (FLAG_enable_liveedit) { @@ -718,7 +719,7 @@ bool Debug::CheckBreakPoint(Handle break_point_object) { // Ignore check if break point object is not a JSObject. if (!break_point_object->IsJSObject()) return true; - // Get the function IsBreakPointTriggered (defined in debug-debugger.js). + // Get the function IsBreakPointTriggered (defined in debug.js). Handle is_break_point_triggered_string = factory->InternalizeOneByteString( STATIC_CHAR_VECTOR("IsBreakPointTriggered")); @@ -2059,7 +2060,7 @@ void Debug::OnAfterCompile(Handle