From bf372a73d8a5f4029fc9f4f69b675ef0cad80ada Mon Sep 17 00:00:00 2001 From: Yang Guo Date: Mon, 20 May 2019 11:15:06 +0200 Subject: [PATCH] Reland "Move logging and diagnostics related source files" TBR=verwaest@chromium.org,rmcilroy@chromium.org NOTREECHECKS=true NOPRESUBMIT=true Bug: v8:9247 Change-Id: I9ddfb6e56ca8e47c4ac186a8df5f442d26420a69 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1617661 Commit-Queue: Yang Guo Reviewed-by: Yang Guo Reviewed-by: Michael Starzinger Cr-Commit-Position: refs/heads/master@{#61642} --- BUILD.gn | 50 +-- COMMON_OWNERS | 37 ++ PRESUBMIT.py | 2 + src/accessors.cc | 2 +- src/api/api.cc | 6 +- src/arm/disasm-arm.cc | 2 +- src/arm/eh-frame-arm.cc | 2 +- src/arm/macro-assembler-arm.cc | 2 +- src/arm/simulator-arm.cc | 2 +- src/arm64/disasm-arm64.cc | 2 +- src/arm64/eh-frame-arm64.cc | 2 +- src/arm64/macro-assembler-arm64.cc | 2 +- src/arm64/simulator-arm64.cc | 2 +- src/asmjs/asm-js.cc | 2 +- src/assembler.cc | 2 +- src/ast/scopes.cc | 2 +- src/builtins/arm/builtins-arm.cc | 2 +- src/builtins/arm64/builtins-arm64.cc | 2 +- src/builtins/builtins-api.cc | 4 +- src/builtins/builtins-array.cc | 2 +- src/builtins/builtins-arraybuffer.cc | 2 +- src/builtins/builtins-bigint.cc | 2 +- src/builtins/builtins-callsite.cc | 2 +- src/builtins/builtins-collections.cc | 2 +- src/builtins/builtins-console.cc | 4 +- src/builtins/builtins-constructor-gen.cc | 2 +- src/builtins/builtins-dataview.cc | 2 +- src/builtins/builtins-date.cc | 2 +- src/builtins/builtins-error.cc | 2 +- src/builtins/builtins-extras-utils.cc | 2 +- src/builtins/builtins-function.cc | 2 +- src/builtins/builtins-global.cc | 2 +- src/builtins/builtins-internal-gen.cc | 2 +- src/builtins/builtins-internal.cc | 2 +- src/builtins/builtins-intl.cc | 2 +- src/builtins/builtins-json.cc | 2 +- src/builtins/builtins-math.cc | 2 +- src/builtins/builtins-number.cc | 2 +- src/builtins/builtins-object.cc | 2 +- src/builtins/builtins-promise.cc | 2 +- src/builtins/builtins-proxy-gen.cc | 2 +- src/builtins/builtins-reflect.cc | 2 +- src/builtins/builtins-regexp-gen.cc | 2 +- src/builtins/builtins-regexp.cc | 2 +- src/builtins/builtins-sharedarraybuffer.cc | 2 +- src/builtins/builtins-string.cc | 2 +- src/builtins/builtins-symbol.cc | 2 +- src/builtins/builtins-trace.cc | 2 +- src/builtins/builtins-typed-array.cc | 2 +- src/builtins/builtins-weak-refs.cc | 2 +- src/builtins/ia32/builtins-ia32.cc | 2 +- src/builtins/mips/builtins-mips.cc | 2 +- src/builtins/mips64/builtins-mips64.cc | 2 +- src/builtins/ppc/builtins-ppc.cc | 2 +- src/builtins/s390/builtins-s390.cc | 2 +- src/builtins/x64/builtins-x64.cc | 2 +- src/code-stub-assembler.cc | 2 +- src/compilation-cache.cc | 4 +- .../optimizing-compile-dispatcher.cc | 4 +- src/compiler.cc | 2 +- src/compiler/access-info.cc | 2 +- .../backend/arm/unwinding-info-writer-arm.h | 2 +- .../arm64/unwinding-info-writer-arm64.h | 2 +- src/compiler/backend/code-generator.cc | 6 +- .../backend/x64/unwinding-info-writer-x64.h | 2 +- src/compiler/basic-block-instrumentor.h | 2 +- src/compiler/js-call-reducer.cc | 2 +- src/compiler/js-intrinsic-lowering.cc | 2 +- src/compiler/pipeline.cc | 2 +- src/compiler/wasm-compiler.cc | 4 +- src/d8/d8.cc | 2 +- src/debug/debug.cc | 2 +- src/debug/liveedit.cc | 2 +- src/deoptimizer.cc | 6 +- src/diagnostics/OWNERS | 1 + src/{ => diagnostics}/basic-block-profiler.cc | 10 +- src/{ => diagnostics}/basic-block-profiler.h | 6 +- src/{ => diagnostics}/disasm.h | 6 +- src/{ => diagnostics}/disassembler.cc | 14 +- src/{ => diagnostics}/disassembler.h | 6 +- src/{ => diagnostics}/eh-frame.cc | 12 +- src/{ => diagnostics}/eh-frame.h | 6 +- src/{ => diagnostics}/gdb-jit.cc | 372 ++++++------------ src/{ => diagnostics}/gdb-jit.h | 6 +- src/{ => diagnostics}/objects-debug.cc | 20 +- src/{ => diagnostics}/objects-printer.cc | 22 +- src/{ => diagnostics}/perf-jit.cc | 7 +- src/{ => diagnostics}/perf-jit.h | 8 +- src/{ => diagnostics}/unwinder.cc | 0 src/{ => diagnostics}/unwinding-info-win64.cc | 2 +- src/{ => diagnostics}/unwinding-info-win64.h | 6 +- src/extensions/statistics-extension.cc | 2 +- src/external-reference-table.cc | 2 +- src/external-reference-table.h | 2 +- src/external-reference.cc | 4 +- src/flags.cc | 2 +- src/heap/factory.cc | 4 +- src/heap/gc-tracer.cc | 2 +- src/heap/gc-tracer.h | 2 +- src/heap/heap.cc | 2 +- src/heap/item-parallel-job.cc | 2 +- src/heap/object-stats.cc | 2 +- src/heap/spaces.cc | 2 +- src/heap/store-buffer.cc | 2 +- src/ia32/assembler-ia32.cc | 2 +- src/ia32/disasm-ia32.cc | 2 +- src/ia32/macro-assembler-ia32.cc | 2 +- src/ic/accessor-assembler.cc | 2 +- src/ic/ic-stats.cc | 2 +- src/ic/stub-cache.cc | 2 +- src/init/bootstrapper.cc | 2 +- src/interpreter/bytecode-array-writer.cc | 2 +- src/interpreter/interpreter.cc | 2 +- src/isolate.cc | 4 +- src/logging/OWNERS | 1 + src/{ => logging}/counters-definitions.h | 78 ++-- src/{ => logging}/counters-inl.h | 8 +- src/{ => logging}/counters.cc | 18 +- src/{ => logging}/counters.h | 38 +- src/{ => logging}/log-inl.h | 8 +- src/{ => logging}/log-utils.cc | 3 +- src/{ => logging}/log-utils.h | 6 +- src/{ => logging}/log.cc | 63 +-- src/{ => logging}/log.h | 14 +- src/messages.cc | 2 +- src/mips/disasm-mips.cc | 2 +- src/mips/macro-assembler-mips.cc | 2 +- src/mips/simulator-mips.cc | 2 +- src/mips64/disasm-mips64.cc | 2 +- src/mips64/macro-assembler-mips64.cc | 2 +- src/mips64/simulator-mips64.cc | 2 +- src/objects.cc | 6 +- src/objects/code.cc | 6 +- src/objects/js-array-buffer.cc | 2 +- src/objects/js-objects.cc | 4 +- src/objects/lookup.cc | 2 +- src/objects/map.cc | 4 +- src/parsing/parse-info.cc | 4 +- src/parsing/parser-base.h | 4 +- src/parsing/parser.cc | 2 +- src/parsing/scanner-character-streams.cc | 2 +- src/ppc/disasm-ppc.cc | 2 +- src/ppc/macro-assembler-ppc.cc | 2 +- src/ppc/simulator-ppc.cc | 2 +- src/profiler/cpu-profiler.cc | 2 +- src/profiler/tick-sample.cc | 2 +- src/regexp/arm/regexp-macro-assembler-arm.cc | 2 +- .../arm64/regexp-macro-assembler-arm64.cc | 2 +- .../ia32/regexp-macro-assembler-ia32.cc | 2 +- .../mips/regexp-macro-assembler-mips.cc | 2 +- .../mips64/regexp-macro-assembler-mips64.cc | 2 +- src/regexp/ppc/regexp-macro-assembler-ppc.cc | 2 +- .../s390/regexp-macro-assembler-s390.cc | 4 +- src/regexp/x64/regexp-macro-assembler-x64.cc | 2 +- src/runtime/runtime-array.cc | 2 +- src/runtime/runtime-atomics.cc | 2 +- src/runtime/runtime-bigint.cc | 2 +- src/runtime/runtime-classes.cc | 4 +- src/runtime/runtime-collections.cc | 2 +- src/runtime/runtime-date.cc | 2 +- src/runtime/runtime-debug.cc | 2 +- src/runtime/runtime-forin.cc | 2 +- src/runtime/runtime-function.cc | 2 +- src/runtime/runtime-futex.cc | 2 +- src/runtime/runtime-generator.cc | 2 +- src/runtime/runtime-internal.cc | 2 +- src/runtime/runtime-interpreter.cc | 2 +- src/runtime/runtime-intl.cc | 2 +- src/runtime/runtime-literals.cc | 2 +- src/runtime/runtime-module.cc | 2 +- src/runtime/runtime-numbers.cc | 2 +- src/runtime/runtime-object.cc | 2 +- src/runtime/runtime-operators.cc | 2 +- src/runtime/runtime-promise.cc | 2 +- src/runtime/runtime-proxy.cc | 2 +- src/runtime/runtime-regexp.cc | 2 +- src/runtime/runtime-scopes.cc | 2 +- src/runtime/runtime-strings.cc | 2 +- src/runtime/runtime-symbol.cc | 2 +- src/runtime/runtime-test.cc | 2 +- src/runtime/runtime-typedarray.cc | 2 +- src/runtime/runtime-wasm.cc | 2 +- src/runtime/runtime-weak-refs.cc | 2 +- src/s390/disasm-s390.cc | 2 +- src/s390/macro-assembler-s390.cc | 2 +- src/s390/simulator-s390.cc | 2 +- src/safepoint-table.cc | 2 +- src/snapshot/code-serializer.cc | 4 +- src/snapshot/deserializer.cc | 2 +- src/snapshot/embedded-file-writer.h | 2 +- src/snapshot/serializer.h | 2 +- src/snapshot/snapshot-common.cc | 2 +- src/string-stream.cc | 2 +- src/tracing/trace-event.cc | 2 +- src/tracing/tracing-category-observer.cc | 2 +- src/vm-state-inl.h | 4 +- src/vm-state.h | 2 +- src/wasm/baseline/liftoff-compiler.cc | 4 +- src/wasm/function-compiler.cc | 2 +- src/wasm/js-to-wasm-wrapper-cache.h | 2 +- src/wasm/module-compiler.cc | 2 +- src/wasm/module-decoder.cc | 2 +- src/wasm/module-instantiate.cc | 2 +- src/wasm/wasm-code-manager.cc | 8 +- src/wasm/wasm-engine.cc | 2 +- src/wasm/wasm-import-wrapper-cache.cc | 2 +- src/wasm/wasm-memory.cc | 2 +- src/wasm/wasm-objects.cc | 2 +- src/x64/assembler-x64.h | 2 +- src/x64/disasm-x64.cc | 2 +- src/x64/eh-frame-x64.cc | 2 +- src/x64/macro-assembler-x64.cc | 2 +- .../compiler/test-basic-block-profiler.cc | 2 +- test/cctest/test-assembler-arm.cc | 2 +- test/cctest/test-assembler-ia32.cc | 2 +- test/cctest/test-assembler-mips.cc | 2 +- test/cctest/test-assembler-mips64.cc | 2 +- test/cctest/test-assembler-ppc.cc | 2 +- test/cctest/test-assembler-s390.cc | 2 +- test/cctest/test-compiler.cc | 2 +- test/cctest/test-cpu-profiler.cc | 2 +- test/cctest/test-disasm-arm.cc | 4 +- test/cctest/test-disasm-ia32.cc | 4 +- test/cctest/test-disasm-mips.cc | 4 +- test/cctest/test-disasm-mips64.cc | 4 +- test/cctest/test-disasm-ppc.cc | 4 +- test/cctest/test-disasm-s390.cc | 4 +- test/cctest/test-disasm-x64.cc | 4 +- test/cctest/test-log-stack-tracer.cc | 2 +- test/cctest/test-log.cc | 4 +- test/cctest/test-poison-disasm-arm.cc | 2 +- test/cctest/test-profile-generator.cc | 2 +- test/cctest/test-sync-primitives-arm.cc | 2 +- test/unittests/counters-unittest.cc | 4 +- test/unittests/eh-frame-iterator-unittest.cc | 2 +- test/unittests/eh-frame-writer-unittest.cc | 2 +- 236 files changed, 587 insertions(+), 733 deletions(-) create mode 100644 COMMON_OWNERS create mode 100644 src/diagnostics/OWNERS rename src/{ => diagnostics}/basic-block-profiler.cc (96%) rename src/{ => diagnostics}/basic-block-profiler.h (93%) rename src/{ => diagnostics}/disasm.h (96%) rename src/{ => diagnostics}/disassembler.cc (98%) rename src/{ => diagnostics}/disassembler.h (89%) rename src/{ => diagnostics}/eh-frame.cc (98%) rename src/{ => diagnostics}/eh-frame.h (98%) rename src/{ => diagnostics}/gdb-jit.cc (88%) rename src/{ => diagnostics}/gdb-jit.h (93%) rename src/{ => diagnostics}/objects-debug.cc (99%) rename src/{ => diagnostics}/objects-printer.cc (99%) rename src/{ => diagnostics}/perf-jit.cc (98%) rename src/{ => diagnostics}/perf-jit.h (97%) rename src/{ => diagnostics}/unwinder.cc (100%) rename src/{ => diagnostics}/unwinding-info-win64.cc (99%) rename src/{ => diagnostics}/unwinding-info-win64.h (95%) create mode 100644 src/logging/OWNERS rename src/{ => logging}/counters-definitions.h (98%) rename src/{ => logging}/counters-inl.h (92%) rename src/{ => logging}/counters.cc (98%) rename src/{ => logging}/counters.h (98%) rename src/{ => logging}/log-inl.h (92%) rename src/{ => logging}/log-utils.cc (99%) rename src/{ => logging}/log-utils.h (98%) rename src/{ => logging}/log.cc (99%) rename src/{ => logging}/log.h (98%) diff --git a/BUILD.gn b/BUILD.gn index 5ed4ded187..93da6f482b 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -2061,8 +2061,6 @@ v8_source_set("v8_base_without_compiler") { "src/ast/variables.h", "src/bailout-reason.cc", "src/bailout-reason.h", - "src/basic-block-profiler.cc", - "src/basic-block-profiler.h", "src/bit-vector.cc", "src/bit-vector.h", "src/boxed-float.h", @@ -2138,10 +2136,6 @@ v8_source_set("v8_base_without_compiler") { "src/contexts-inl.h", "src/contexts.cc", "src/contexts.h", - "src/counters-definitions.h", - "src/counters-inl.h", - "src/counters.cc", - "src/counters.h", "src/cpu-features.h", "src/date/date.cc", "src/date/date.h", @@ -2176,11 +2170,20 @@ v8_source_set("v8_base_without_compiler") { "src/deoptimizer.h", "src/detachable-vector.cc", "src/detachable-vector.h", - "src/disasm.h", - "src/disassembler.cc", - "src/disassembler.h", - "src/eh-frame.cc", - "src/eh-frame.h", + "src/diagnostics/basic-block-profiler.cc", + "src/diagnostics/basic-block-profiler.h", + "src/diagnostics/disasm.h", + "src/diagnostics/disassembler.cc", + "src/diagnostics/disassembler.h", + "src/diagnostics/eh-frame.cc", + "src/diagnostics/eh-frame.h", + "src/diagnostics/gdb-jit.cc", + "src/diagnostics/gdb-jit.h", + "src/diagnostics/objects-debug.cc", + "src/diagnostics/objects-printer.cc", + "src/diagnostics/perf-jit.cc", + "src/diagnostics/perf-jit.h", + "src/diagnostics/unwinder.cc", "src/execution.cc", "src/execution.h", "src/extensions/externalize-string-extension.cc", @@ -2214,8 +2217,6 @@ v8_source_set("v8_base_without_compiler") { "src/function-kind.h", "src/futex-emulation.cc", "src/futex-emulation.h", - "src/gdb-jit.cc", - "src/gdb-jit.h", "src/global-handles.cc", "src/global-handles.h", "src/handler-table.cc", @@ -2383,11 +2384,15 @@ v8_source_set("v8_base_without_compiler") { "src/label.h", "src/locked-queue-inl.h", "src/locked-queue.h", - "src/log-inl.h", - "src/log-utils.cc", - "src/log-utils.h", - "src/log.cc", - "src/log.h", + "src/logging/counters-definitions.h", + "src/logging/counters-inl.h", + "src/logging/counters.cc", + "src/logging/counters.h", + "src/logging/log-inl.h", + "src/logging/log-utils.cc", + "src/logging/log-utils.h", + "src/logging/log.cc", + "src/logging/log.h", "src/machine-type.cc", "src/machine-type.h", "src/macro-assembler-inl.h", @@ -2426,9 +2431,7 @@ v8_source_set("v8_base_without_compiler") { "src/numbers/strtod.h", "src/objects-body-descriptors-inl.h", "src/objects-body-descriptors.h", - "src/objects-debug.cc", "src/objects-inl.h", - "src/objects-printer.cc", "src/objects.cc", "src/objects.h", "src/objects/allocation-site-inl.h", @@ -2658,8 +2661,6 @@ v8_source_set("v8_base_without_compiler") { "src/parsing/token.h", "src/pending-compilation-error-handler.cc", "src/pending-compilation-error-handler.h", - "src/perf-jit.cc", - "src/perf-jit.h", "src/pointer-with-payload.h", "src/profiler/allocation-tracker.cc", "src/profiler/allocation-tracker.h", @@ -2848,7 +2849,6 @@ v8_source_set("v8_base_without_compiler") { "src/unicode.h", "src/unoptimized-compilation-info.cc", "src/unoptimized-compilation-info.h", - "src/unwinder.cc", "src/uri.cc", "src/uri.h", "src/utils-inl.h", @@ -3043,11 +3043,11 @@ v8_source_set("v8_base_without_compiler") { } if (is_win) { sources += [ + "src/diagnostics/unwinding-info-win64.cc", + "src/diagnostics/unwinding-info-win64.h", "src/trap-handler/handler-inside-win.cc", "src/trap-handler/handler-inside-win.h", "src/trap-handler/handler-outside-win.cc", - "src/unwinding-info-win64.cc", - "src/unwinding-info-win64.h", ] } } else if (v8_current_cpu == "arm") { diff --git a/COMMON_OWNERS b/COMMON_OWNERS new file mode 100644 index 0000000000..d783564869 --- /dev/null +++ b/COMMON_OWNERS @@ -0,0 +1,37 @@ +adamk@chromium.org +ahaas@chromium.org +bbudge@chromium.org +binji@chromium.org +bmeurer@chromium.org +cbruni@chromium.org +clemensh@chromium.org +danno@chromium.org +delphick@chromium.org +gdeepti@chromium.org +gsathya@chromium.org +hablich@chromium.org +hpayer@chromium.org +ishell@chromium.org +jarin@chromium.org +jgruber@chromium.org +jkummerow@chromium.org +leszeks@chromium.org +machenbach@chromium.org +mathias@chromium.org +marja@chromium.org +mlippautz@chromium.org +mslekova@chromium.org +mstarzinger@chromium.org +mvstanton@chromium.org +mythria@chromium.org +neis@chromium.org +petermarshall@chromium.org +rmcilroy@chromium.org +sergiyb@chromium.org +sigurds@chromium.org +szuend@chromium.org +tebbi@chromium.org +titzer@chromium.org +ulan@chromium.org +verwaest@chromium.org +yangguo@chromium.org diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 8aea920ef4..201bf55f71 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -433,6 +433,8 @@ def _CheckMacroUndefs(input_api, output_api): undef_match = undef_pattern.match(line) if undef_match: + if "// NOLINT" in line: + continue name = undef_match.group(1) if not name in defined_macros: errors.append('{}:{}: Macro named \'{}\' was not defined before.' diff --git a/src/accessors.cc b/src/accessors.cc index ab3ac5076f..4cc50deb27 100644 --- a/src/accessors.cc +++ b/src/accessors.cc @@ -6,12 +6,12 @@ #include "src/api/api-inl.h" #include "src/contexts.h" -#include "src/counters.h" #include "src/deoptimizer.h" #include "src/execution.h" #include "src/frames-inl.h" #include "src/heap/factory.h" #include "src/isolate-inl.h" +#include "src/logging/counters.h" #include "src/messages.h" #include "src/objects/api-callbacks.h" #include "src/objects/field-index-inl.h" diff --git a/src/api/api.cc b/src/api/api.cc index e6d6681db5..a52c36e746 100644 --- a/src/api/api.cc +++ b/src/api/api.cc @@ -28,7 +28,6 @@ #include "src/compiler-dispatcher/compiler-dispatcher.h" #include "src/compiler.h" #include "src/contexts.h" -#include "src/counters.h" #include "src/cpu-features.h" #include "src/date/date.h" #include "src/debug/debug-coverage.h" @@ -38,9 +37,9 @@ #include "src/debug/liveedit.h" #include "src/deoptimizer.h" #include "src/detachable-vector.h" +#include "src/diagnostics/gdb-jit.h" #include "src/execution.h" #include "src/frames-inl.h" -#include "src/gdb-jit.h" #include "src/global-handles.h" #include "src/globals.h" #include "src/heap/heap-inl.h" @@ -50,6 +49,7 @@ #include "src/isolate-inl.h" #include "src/json-parser.h" #include "src/json-stringifier.h" +#include "src/logging/counters.h" #include "src/messages.h" #include "src/microtask-queue.h" #include "src/numbers/conversions-inl.h" @@ -121,7 +121,7 @@ #include "include/v8-wasm-trap-handler-win.h" #include "src/trap-handler/handler-inside-win.h" #if V8_TARGET_ARCH_X64 -#include "src/unwinding-info-win64.h" +#include "src/diagnostics/unwinding-info-win64.h" #endif // V8_TARGET_ARCH_X64 #endif // V8_OS_WIN diff --git a/src/arm/disasm-arm.cc b/src/arm/disasm-arm.cc index fad898dd72..9aabba39b5 100644 --- a/src/arm/disasm-arm.cc +++ b/src/arm/disasm-arm.cc @@ -34,7 +34,7 @@ #include "src/arm/constants-arm.h" #include "src/base/bits.h" #include "src/base/platform/platform.h" -#include "src/disasm.h" +#include "src/diagnostics/disasm.h" #include "src/vector.h" namespace v8 { diff --git a/src/arm/eh-frame-arm.cc b/src/arm/eh-frame-arm.cc index f0902691bc..7d0dc49155 100644 --- a/src/arm/eh-frame-arm.cc +++ b/src/arm/eh-frame-arm.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "src/eh-frame.h" +#include "src/diagnostics/eh-frame.h" namespace v8 { namespace internal { diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc index 1985bfbf2e..8bcd05ec49 100644 --- a/src/arm/macro-assembler-arm.cc +++ b/src/arm/macro-assembler-arm.cc @@ -12,12 +12,12 @@ #include "src/base/utils/random-number-generator.h" #include "src/callable.h" #include "src/code-factory.h" -#include "src/counters.h" #include "src/debug/debug.h" #include "src/external-reference-table.h" #include "src/frames-inl.h" #include "src/heap/heap-inl.h" // For MemoryChunk. #include "src/init/bootstrapper.h" +#include "src/logging/counters.h" #include "src/macro-assembler.h" #include "src/numbers/double.h" #include "src/objects-inl.h" diff --git a/src/arm/simulator-arm.cc b/src/arm/simulator-arm.cc index 235da9f519..e4b93792f0 100644 --- a/src/arm/simulator-arm.cc +++ b/src/arm/simulator-arm.cc @@ -14,7 +14,7 @@ #include "src/assembler-inl.h" #include "src/base/bits.h" #include "src/base/lazy-instance.h" -#include "src/disasm.h" +#include "src/diagnostics/disasm.h" #include "src/heap/combined-heap.h" #include "src/macro-assembler.h" #include "src/objects-inl.h" diff --git a/src/arm64/disasm-arm64.cc b/src/arm64/disasm-arm64.cc index 09beceb197..b8d59110e0 100644 --- a/src/arm64/disasm-arm64.cc +++ b/src/arm64/disasm-arm64.cc @@ -13,7 +13,7 @@ #include "src/arm64/disasm-arm64.h" #include "src/arm64/utils-arm64.h" #include "src/base/platform/platform.h" -#include "src/disasm.h" +#include "src/diagnostics/disasm.h" namespace v8 { namespace internal { diff --git a/src/arm64/eh-frame-arm64.cc b/src/arm64/eh-frame-arm64.cc index 79d8510f9b..3b945325fb 100644 --- a/src/arm64/eh-frame-arm64.cc +++ b/src/arm64/eh-frame-arm64.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "src/arm64/assembler-arm64-inl.h" -#include "src/eh-frame.h" +#include "src/diagnostics/eh-frame.h" namespace v8 { namespace internal { diff --git a/src/arm64/macro-assembler-arm64.cc b/src/arm64/macro-assembler-arm64.cc index 34dd54401d..60bcb9bd13 100644 --- a/src/arm64/macro-assembler-arm64.cc +++ b/src/arm64/macro-assembler-arm64.cc @@ -9,13 +9,13 @@ #include "src/base/division-by-constant.h" #include "src/callable.h" #include "src/code-factory.h" -#include "src/counters.h" #include "src/debug/debug.h" #include "src/external-reference-table.h" #include "src/frame-constants.h" #include "src/frames-inl.h" #include "src/heap/heap-inl.h" // For MemoryChunk. #include "src/init/bootstrapper.h" +#include "src/logging/counters.h" #include "src/macro-assembler-inl.h" #include "src/register-configuration.h" #include "src/runtime/runtime.h" diff --git a/src/arm64/simulator-arm64.cc b/src/arm64/simulator-arm64.cc index 214780cd8b..b60cf509b1 100644 --- a/src/arm64/simulator-arm64.cc +++ b/src/arm64/simulator-arm64.cc @@ -14,7 +14,7 @@ #include "src/arm64/decoder-arm64-inl.h" #include "src/assembler-inl.h" #include "src/base/lazy-instance.h" -#include "src/disasm.h" +#include "src/diagnostics/disasm.h" #include "src/heap/combined-heap.h" #include "src/macro-assembler.h" #include "src/objects-inl.h" diff --git a/src/asmjs/asm-js.cc b/src/asmjs/asm-js.cc index ddfbae7a0b..85ae61b045 100644 --- a/src/asmjs/asm-js.cc +++ b/src/asmjs/asm-js.cc @@ -11,11 +11,11 @@ #include "src/base/optional.h" #include "src/base/platform/elapsed-timer.h" #include "src/compiler.h" -#include "src/counters.h" #include "src/execution.h" #include "src/handles.h" #include "src/heap/factory.h" #include "src/isolate.h" +#include "src/logging/counters.h" #include "src/message-template.h" #include "src/objects-inl.h" #include "src/objects/heap-number-inl.h" diff --git a/src/assembler.cc b/src/assembler.cc index f057bf4ef9..06c086d415 100644 --- a/src/assembler.cc +++ b/src/assembler.cc @@ -36,7 +36,7 @@ #include "src/assembler-inl.h" #include "src/deoptimizer.h" -#include "src/disassembler.h" +#include "src/diagnostics/disassembler.h" #include "src/heap/heap-inl.h" // For MemoryAllocator. TODO(jkummerow): Drop. #include "src/isolate.h" #include "src/ostreams.h" diff --git a/src/ast/scopes.cc b/src/ast/scopes.cc index 175b63d1a7..fa5138919f 100644 --- a/src/ast/scopes.cc +++ b/src/ast/scopes.cc @@ -9,8 +9,8 @@ #include "src/accessors.h" #include "src/ast/ast.h" #include "src/base/optional.h" -#include "src/counters.h" #include "src/init/bootstrapper.h" +#include "src/logging/counters.h" #include "src/message-template.h" #include "src/objects-inl.h" #include "src/objects/module-inl.h" diff --git a/src/builtins/arm/builtins-arm.cc b/src/builtins/arm/builtins-arm.cc index 508adaabdd..7ee1ca3409 100644 --- a/src/builtins/arm/builtins-arm.cc +++ b/src/builtins/arm/builtins-arm.cc @@ -6,11 +6,11 @@ #include "src/api/api-arguments.h" #include "src/code-factory.h" -#include "src/counters.h" #include "src/debug/debug.h" #include "src/deoptimizer.h" #include "src/frame-constants.h" #include "src/frames.h" +#include "src/logging/counters.h" // For interpreter_entry_return_pc_offset. TODO(jkummerow): Drop. #include "src/heap/heap-inl.h" #include "src/macro-assembler-inl.h" diff --git a/src/builtins/arm64/builtins-arm64.cc b/src/builtins/arm64/builtins-arm64.cc index 5d338a1fec..2c3a20910e 100644 --- a/src/builtins/arm64/builtins-arm64.cc +++ b/src/builtins/arm64/builtins-arm64.cc @@ -6,11 +6,11 @@ #include "src/api/api-arguments.h" #include "src/code-factory.h" -#include "src/counters.h" #include "src/debug/debug.h" #include "src/deoptimizer.h" #include "src/frame-constants.h" #include "src/frames.h" +#include "src/logging/counters.h" // For interpreter_entry_return_pc_offset. TODO(jkummerow): Drop. #include "src/heap/heap-inl.h" #include "src/macro-assembler-inl.h" diff --git a/src/builtins/builtins-api.cc b/src/builtins/builtins-api.cc index 8b1f3fd815..d5c6fd2ef4 100644 --- a/src/builtins/builtins-api.cc +++ b/src/builtins/builtins-api.cc @@ -6,8 +6,8 @@ #include "src/api/api-natives.h" #include "src/builtins/builtins-utils-inl.h" #include "src/builtins/builtins.h" -#include "src/counters.h" -#include "src/log.h" +#include "src/logging/counters.h" +#include "src/logging/log.h" #include "src/objects-inl.h" #include "src/objects/prototype.h" #include "src/objects/templates.h" diff --git a/src/builtins/builtins-array.cc b/src/builtins/builtins-array.cc index 657235cbfc..112c4bb7fb 100644 --- a/src/builtins/builtins-array.cc +++ b/src/builtins/builtins-array.cc @@ -6,10 +6,10 @@ #include "src/builtins/builtins.h" #include "src/code-factory.h" #include "src/contexts.h" -#include "src/counters.h" #include "src/debug/debug.h" #include "src/global-handles.h" #include "src/isolate.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" #include "src/objects/elements-inl.h" #include "src/objects/hash-table-inl.h" diff --git a/src/builtins/builtins-arraybuffer.cc b/src/builtins/builtins-arraybuffer.cc index 4a7df075ba..49280cab4c 100644 --- a/src/builtins/builtins-arraybuffer.cc +++ b/src/builtins/builtins-arraybuffer.cc @@ -4,8 +4,8 @@ #include "src/builtins/builtins-utils-inl.h" #include "src/builtins/builtins.h" -#include "src/counters.h" #include "src/heap/heap-inl.h" // For ToBoolean. TODO(jkummerow): Drop. +#include "src/logging/counters.h" #include "src/maybe-handles-inl.h" #include "src/numbers/conversions.h" #include "src/objects-inl.h" diff --git a/src/builtins/builtins-bigint.cc b/src/builtins/builtins-bigint.cc index 79c4e94640..70007d556e 100644 --- a/src/builtins/builtins-bigint.cc +++ b/src/builtins/builtins-bigint.cc @@ -4,7 +4,7 @@ #include "src/builtins/builtins-utils-inl.h" #include "src/builtins/builtins.h" -#include "src/counters.h" +#include "src/logging/counters.h" #include "src/numbers/conversions.h" #include "src/objects-inl.h" #ifdef V8_INTL_SUPPORT diff --git a/src/builtins/builtins-callsite.cc b/src/builtins/builtins-callsite.cc index 51580899d2..192eba4a24 100644 --- a/src/builtins/builtins-callsite.cc +++ b/src/builtins/builtins-callsite.cc @@ -4,8 +4,8 @@ #include "src/builtins/builtins-utils-inl.h" #include "src/builtins/builtins.h" -#include "src/counters.h" #include "src/heap/heap-inl.h" // For ToBoolean. +#include "src/logging/counters.h" #include "src/objects-inl.h" #include "src/objects/frame-array-inl.h" diff --git a/src/builtins/builtins-collections.cc b/src/builtins/builtins-collections.cc index be7a47290b..d2a02a0810 100644 --- a/src/builtins/builtins-collections.cc +++ b/src/builtins/builtins-collections.cc @@ -4,7 +4,7 @@ #include "src/builtins/builtins-utils-inl.h" #include "src/builtins/builtins.h" -#include "src/counters.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" #include "src/objects/js-collection-inl.h" diff --git a/src/builtins/builtins-console.cc b/src/builtins/builtins-console.cc index 1706cdbc72..e994e9be41 100644 --- a/src/builtins/builtins-console.cc +++ b/src/builtins/builtins-console.cc @@ -5,9 +5,9 @@ #include "src/api/api-inl.h" #include "src/builtins/builtins-utils-inl.h" #include "src/builtins/builtins.h" -#include "src/counters.h" #include "src/debug/interface-types.h" -#include "src/log.h" +#include "src/logging/counters.h" +#include "src/logging/log.h" #include "src/objects-inl.h" namespace v8 { diff --git a/src/builtins/builtins-constructor-gen.cc b/src/builtins/builtins-constructor-gen.cc index 5de4eca89e..f9dd7961b3 100644 --- a/src/builtins/builtins-constructor-gen.cc +++ b/src/builtins/builtins-constructor-gen.cc @@ -11,8 +11,8 @@ #include "src/builtins/builtins.h" #include "src/code-factory.h" #include "src/code-stub-assembler.h" -#include "src/counters.h" #include "src/interface-descriptors.h" +#include "src/logging/counters.h" #include "src/macro-assembler.h" #include "src/objects-inl.h" diff --git a/src/builtins/builtins-dataview.cc b/src/builtins/builtins-dataview.cc index a275125436..4e9883817f 100644 --- a/src/builtins/builtins-dataview.cc +++ b/src/builtins/builtins-dataview.cc @@ -4,9 +4,9 @@ #include "src/builtins/builtins-utils-inl.h" #include "src/builtins/builtins.h" -#include "src/counters.h" #include "src/heap/factory.h" #include "src/isolate.h" +#include "src/logging/counters.h" #include "src/numbers/conversions.h" #include "src/objects-inl.h" #include "src/objects/js-array-buffer-inl.h" diff --git a/src/builtins/builtins-date.cc b/src/builtins/builtins-date.cc index 5fb07ee360..2847b33e14 100644 --- a/src/builtins/builtins-date.cc +++ b/src/builtins/builtins-date.cc @@ -5,9 +5,9 @@ #include "src/builtins/builtins-utils-inl.h" #include "src/builtins/builtins.h" #include "src/code-factory.h" -#include "src/counters.h" #include "src/date/date.h" #include "src/date/dateparser-inl.h" +#include "src/logging/counters.h" #include "src/numbers/conversions.h" #include "src/objects-inl.h" #ifdef V8_INTL_SUPPORT diff --git a/src/builtins/builtins-error.cc b/src/builtins/builtins-error.cc index 51b7f34b72..15e41a7f17 100644 --- a/src/builtins/builtins-error.cc +++ b/src/builtins/builtins-error.cc @@ -5,8 +5,8 @@ #include "src/accessors.h" #include "src/builtins/builtins-utils-inl.h" #include "src/builtins/builtins.h" -#include "src/counters.h" #include "src/isolate-inl.h" +#include "src/logging/counters.h" #include "src/messages.h" #include "src/objects-inl.h" #include "src/objects/api-callbacks.h" diff --git a/src/builtins/builtins-extras-utils.cc b/src/builtins/builtins-extras-utils.cc index c5602a2144..6b191a351a 100644 --- a/src/builtins/builtins-extras-utils.cc +++ b/src/builtins/builtins-extras-utils.cc @@ -6,7 +6,7 @@ #include "src/builtins/builtins.h" #include "src/objects/elements.h" -#include "src/counters.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" namespace v8 { diff --git a/src/builtins/builtins-function.cc b/src/builtins/builtins-function.cc index 7f6b2d49b8..8608fe6ffd 100644 --- a/src/builtins/builtins-function.cc +++ b/src/builtins/builtins-function.cc @@ -6,7 +6,7 @@ #include "src/builtins/builtins.h" #include "src/code-factory.h" #include "src/compiler.h" -#include "src/counters.h" +#include "src/logging/counters.h" #include "src/numbers/conversions.h" #include "src/objects-inl.h" #include "src/objects/api-callbacks.h" diff --git a/src/builtins/builtins-global.cc b/src/builtins/builtins-global.cc index 83820de135..af26fcd91a 100644 --- a/src/builtins/builtins-global.cc +++ b/src/builtins/builtins-global.cc @@ -6,7 +6,7 @@ #include "src/builtins/builtins.h" #include "src/code-factory.h" #include "src/compiler.h" -#include "src/counters.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" #include "src/uri.h" diff --git a/src/builtins/builtins-internal-gen.cc b/src/builtins/builtins-internal-gen.cc index b29b275282..5eae20dfd6 100644 --- a/src/builtins/builtins-internal-gen.cc +++ b/src/builtins/builtins-internal-gen.cc @@ -6,10 +6,10 @@ #include "src/builtins/builtins-utils-gen.h" #include "src/builtins/builtins.h" #include "src/code-stub-assembler.h" -#include "src/counters.h" #include "src/heap/heap-inl.h" // crbug.com/v8/8499 #include "src/ic/accessor-assembler.h" #include "src/ic/keyed-store-generic.h" +#include "src/logging/counters.h" #include "src/macro-assembler.h" #include "src/objects/debug-objects.h" #include "src/objects/shared-function-info.h" diff --git a/src/builtins/builtins-internal.cc b/src/builtins/builtins-internal.cc index 3a1eb078d0..0ef8d3927d 100644 --- a/src/builtins/builtins-internal.cc +++ b/src/builtins/builtins-internal.cc @@ -4,8 +4,8 @@ #include "src/builtins/builtins-utils.h" #include "src/builtins/builtins.h" -#include "src/counters.h" #include "src/interface-descriptors.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" namespace v8 { diff --git a/src/builtins/builtins-intl.cc b/src/builtins/builtins-intl.cc index 0f7318a64b..3da0c8e4fe 100644 --- a/src/builtins/builtins-intl.cc +++ b/src/builtins/builtins-intl.cc @@ -12,8 +12,8 @@ #include "src/builtins/builtins-utils-inl.h" #include "src/builtins/builtins.h" -#include "src/counters.h" #include "src/date/date.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" #include "src/objects/elements.h" #include "src/objects/intl-objects.h" diff --git a/src/builtins/builtins-json.cc b/src/builtins/builtins-json.cc index 935be0be18..99c0f03666 100644 --- a/src/builtins/builtins-json.cc +++ b/src/builtins/builtins-json.cc @@ -4,9 +4,9 @@ #include "src/builtins/builtins-utils-inl.h" #include "src/builtins/builtins.h" -#include "src/counters.h" #include "src/json-parser.h" #include "src/json-stringifier.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" namespace v8 { diff --git a/src/builtins/builtins-math.cc b/src/builtins/builtins-math.cc index ae2bf03d69..3049851706 100644 --- a/src/builtins/builtins-math.cc +++ b/src/builtins/builtins-math.cc @@ -4,7 +4,7 @@ #include "src/builtins/builtins-utils.h" #include "src/builtins/builtins.h" -#include "src/counters.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" namespace v8 { diff --git a/src/builtins/builtins-number.cc b/src/builtins/builtins-number.cc index 838db04633..36d67debbc 100644 --- a/src/builtins/builtins-number.cc +++ b/src/builtins/builtins-number.cc @@ -5,7 +5,7 @@ #include "src/builtins/builtins-utils-inl.h" #include "src/builtins/builtins.h" #include "src/code-factory.h" -#include "src/counters.h" +#include "src/logging/counters.h" #include "src/numbers/conversions.h" #include "src/objects-inl.h" #ifdef V8_INTL_SUPPORT diff --git a/src/builtins/builtins-object.cc b/src/builtins/builtins-object.cc index 5b4ad977f8..50147bb896 100644 --- a/src/builtins/builtins-object.cc +++ b/src/builtins/builtins-object.cc @@ -5,9 +5,9 @@ #include "src/builtins/builtins-utils-inl.h" #include "src/builtins/builtins.h" #include "src/code-factory.h" -#include "src/counters.h" #include "src/heap/heap-inl.h" // For ToBoolean. TODO(jkummerow): Drop. #include "src/keys.h" +#include "src/logging/counters.h" #include "src/message-template.h" #include "src/objects-inl.h" #include "src/objects/lookup.h" diff --git a/src/builtins/builtins-promise.cc b/src/builtins/builtins-promise.cc index f742252050..d763eb9c0e 100644 --- a/src/builtins/builtins-promise.cc +++ b/src/builtins/builtins-promise.cc @@ -6,8 +6,8 @@ #include "src/builtins/builtins-utils-inl.h" #include "src/builtins/builtins.h" -#include "src/counters.h" #include "src/heap/heap-inl.h" // For ToBoolean. TODO(jkummerow): Drop. +#include "src/logging/counters.h" #include "src/objects-inl.h" namespace v8 { diff --git a/src/builtins/builtins-proxy-gen.cc b/src/builtins/builtins-proxy-gen.cc index 2918db29ed..5b91c31947 100644 --- a/src/builtins/builtins-proxy-gen.cc +++ b/src/builtins/builtins-proxy-gen.cc @@ -7,7 +7,7 @@ #include "src/builtins/builtins-utils.h" #include "src/builtins/builtins.h" -#include "src/counters.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" namespace v8 { diff --git a/src/builtins/builtins-reflect.cc b/src/builtins/builtins-reflect.cc index b089712a34..e146cac6d7 100644 --- a/src/builtins/builtins-reflect.cc +++ b/src/builtins/builtins-reflect.cc @@ -4,8 +4,8 @@ #include "src/builtins/builtins-utils-inl.h" #include "src/builtins/builtins.h" -#include "src/counters.h" #include "src/keys.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" #include "src/objects/lookup.h" #include "src/objects/property-descriptor.h" diff --git a/src/builtins/builtins-regexp-gen.cc b/src/builtins/builtins-regexp-gen.cc index 8575febeba..6e66b45f5d 100644 --- a/src/builtins/builtins-regexp-gen.cc +++ b/src/builtins/builtins-regexp-gen.cc @@ -10,8 +10,8 @@ #include "src/builtins/growable-fixed-array-gen.h" #include "src/code-factory.h" #include "src/code-stub-assembler.h" -#include "src/counters.h" #include "src/heap/factory-inl.h" +#include "src/logging/counters.h" #include "src/objects/js-regexp-string-iterator.h" #include "src/objects/js-regexp.h" #include "src/objects/regexp-match-info.h" diff --git a/src/builtins/builtins-regexp.cc b/src/builtins/builtins-regexp.cc index e763ab10ea..265f4885cc 100644 --- a/src/builtins/builtins-regexp.cc +++ b/src/builtins/builtins-regexp.cc @@ -4,7 +4,7 @@ #include "src/builtins/builtins-utils-inl.h" #include "src/builtins/builtins.h" -#include "src/counters.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" #include "src/regexp/jsregexp.h" #include "src/regexp/regexp-utils.h" diff --git a/src/builtins/builtins-sharedarraybuffer.cc b/src/builtins/builtins-sharedarraybuffer.cc index d262a501e6..32499c9240 100644 --- a/src/builtins/builtins-sharedarraybuffer.cc +++ b/src/builtins/builtins-sharedarraybuffer.cc @@ -8,10 +8,10 @@ #include "src/builtins/builtins-utils-inl.h" #include "src/builtins/builtins.h" #include "src/code-factory.h" -#include "src/counters.h" #include "src/futex-emulation.h" #include "src/globals.h" #include "src/heap/factory.h" +#include "src/logging/counters.h" #include "src/numbers/conversions-inl.h" #include "src/objects-inl.h" #include "src/objects/js-array-buffer-inl.h" diff --git a/src/builtins/builtins-string.cc b/src/builtins/builtins-string.cc index 75102a0764..3bf52cf089 100644 --- a/src/builtins/builtins-string.cc +++ b/src/builtins/builtins-string.cc @@ -4,8 +4,8 @@ #include "src/builtins/builtins-utils-inl.h" #include "src/builtins/builtins.h" -#include "src/counters.h" #include "src/heap/heap-inl.h" // For ToBoolean. TODO(jkummerow): Drop. +#include "src/logging/counters.h" #include "src/numbers/conversions.h" #include "src/objects-inl.h" #ifdef V8_INTL_SUPPORT diff --git a/src/builtins/builtins-symbol.cc b/src/builtins/builtins-symbol.cc index 66fa69afff..4ff872a8bf 100644 --- a/src/builtins/builtins-symbol.cc +++ b/src/builtins/builtins-symbol.cc @@ -4,8 +4,8 @@ #include "src/builtins/builtins-utils-inl.h" #include "src/builtins/builtins.h" -#include "src/counters.h" #include "src/heap/heap-inl.h" // For public_symbol_table(). +#include "src/logging/counters.h" #include "src/objects-inl.h" namespace v8 { diff --git a/src/builtins/builtins-trace.cc b/src/builtins/builtins-trace.cc index 9be2682478..26ba209bcc 100644 --- a/src/builtins/builtins-trace.cc +++ b/src/builtins/builtins-trace.cc @@ -5,9 +5,9 @@ #include "src/api/api-inl.h" #include "src/builtins/builtins-utils-inl.h" #include "src/builtins/builtins.h" -#include "src/counters.h" #include "src/heap/heap-inl.h" // For ToBoolean. TODO(jkummerow): Drop. #include "src/json-stringifier.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" namespace v8 { diff --git a/src/builtins/builtins-typed-array.cc b/src/builtins/builtins-typed-array.cc index f020bd3437..27d17d0891 100644 --- a/src/builtins/builtins-typed-array.cc +++ b/src/builtins/builtins-typed-array.cc @@ -4,7 +4,7 @@ #include "src/builtins/builtins-utils-inl.h" #include "src/builtins/builtins.h" -#include "src/counters.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" #include "src/objects/elements.h" #include "src/objects/heap-number-inl.h" diff --git a/src/builtins/builtins-weak-refs.cc b/src/builtins/builtins-weak-refs.cc index 1d8a6f39f6..eecce26bb9 100644 --- a/src/builtins/builtins-weak-refs.cc +++ b/src/builtins/builtins-weak-refs.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "src/builtins/builtins-utils-inl.h" -#include "src/counters.h" +#include "src/logging/counters.h" #include "src/objects/js-weak-refs-inl.h" namespace v8 { diff --git a/src/builtins/ia32/builtins-ia32.cc b/src/builtins/ia32/builtins-ia32.cc index 3e4118520a..116c0e43c9 100644 --- a/src/builtins/ia32/builtins-ia32.cc +++ b/src/builtins/ia32/builtins-ia32.cc @@ -7,11 +7,11 @@ #include "src/api/api-arguments.h" #include "src/base/adapters.h" #include "src/code-factory.h" -#include "src/counters.h" #include "src/debug/debug.h" #include "src/deoptimizer.h" #include "src/frame-constants.h" #include "src/frames.h" +#include "src/logging/counters.h" // For interpreter_entry_return_pc_offset. TODO(jkummerow): Drop. #include "src/heap/heap-inl.h" #include "src/macro-assembler-inl.h" diff --git a/src/builtins/mips/builtins-mips.cc b/src/builtins/mips/builtins-mips.cc index 58d0e61806..1c78dfcc7d 100644 --- a/src/builtins/mips/builtins-mips.cc +++ b/src/builtins/mips/builtins-mips.cc @@ -6,11 +6,11 @@ #include "src/api/api-arguments.h" #include "src/code-factory.h" -#include "src/counters.h" #include "src/debug/debug.h" #include "src/deoptimizer.h" #include "src/frame-constants.h" #include "src/frames.h" +#include "src/logging/counters.h" // For interpreter_entry_return_pc_offset. TODO(jkummerow): Drop. #include "src/heap/heap-inl.h" #include "src/macro-assembler-inl.h" diff --git a/src/builtins/mips64/builtins-mips64.cc b/src/builtins/mips64/builtins-mips64.cc index 723c0881a3..3a1f453f69 100644 --- a/src/builtins/mips64/builtins-mips64.cc +++ b/src/builtins/mips64/builtins-mips64.cc @@ -6,11 +6,11 @@ #include "src/api/api-arguments.h" #include "src/code-factory.h" -#include "src/counters.h" #include "src/debug/debug.h" #include "src/deoptimizer.h" #include "src/frame-constants.h" #include "src/frames.h" +#include "src/logging/counters.h" // For interpreter_entry_return_pc_offset. TODO(jkummerow): Drop. #include "src/heap/heap-inl.h" #include "src/macro-assembler-inl.h" diff --git a/src/builtins/ppc/builtins-ppc.cc b/src/builtins/ppc/builtins-ppc.cc index 9eee8ee758..7d7210137b 100644 --- a/src/builtins/ppc/builtins-ppc.cc +++ b/src/builtins/ppc/builtins-ppc.cc @@ -6,11 +6,11 @@ #include "src/api/api-arguments.h" #include "src/code-factory.h" -#include "src/counters.h" #include "src/debug/debug.h" #include "src/deoptimizer.h" #include "src/frame-constants.h" #include "src/frames.h" +#include "src/logging/counters.h" // For interpreter_entry_return_pc_offset. TODO(jkummerow): Drop. #include "src/heap/heap-inl.h" #include "src/macro-assembler-inl.h" diff --git a/src/builtins/s390/builtins-s390.cc b/src/builtins/s390/builtins-s390.cc index 2af36f7a1a..9f891a7b2e 100644 --- a/src/builtins/s390/builtins-s390.cc +++ b/src/builtins/s390/builtins-s390.cc @@ -6,11 +6,11 @@ #include "src/api/api-arguments.h" #include "src/code-factory.h" -#include "src/counters.h" #include "src/debug/debug.h" #include "src/deoptimizer.h" #include "src/frame-constants.h" #include "src/frames.h" +#include "src/logging/counters.h" // For interpreter_entry_return_pc_offset. TODO(jkummerow): Drop. #include "src/heap/heap-inl.h" #include "src/macro-assembler-inl.h" diff --git a/src/builtins/x64/builtins-x64.cc b/src/builtins/x64/builtins-x64.cc index 5256f2065d..d9ce0a6cff 100644 --- a/src/builtins/x64/builtins-x64.cc +++ b/src/builtins/x64/builtins-x64.cc @@ -7,10 +7,10 @@ #include "src/api/api-arguments.h" #include "src/base/adapters.h" #include "src/code-factory.h" -#include "src/counters.h" #include "src/deoptimizer.h" #include "src/frame-constants.h" #include "src/frames.h" +#include "src/logging/counters.h" // For interpreter_entry_return_pc_offset. TODO(jkummerow): Drop. #include "src/heap/heap-inl.h" #include "src/macro-assembler-inl.h" diff --git a/src/code-stub-assembler.cc b/src/code-stub-assembler.cc index 767a854f36..9f45f15a3e 100644 --- a/src/code-stub-assembler.cc +++ b/src/code-stub-assembler.cc @@ -5,11 +5,11 @@ #include "src/code-stub-assembler.h" #include "src/code-factory.h" -#include "src/counters.h" #include "src/frames-inl.h" #include "src/frames.h" #include "src/function-kind.h" #include "src/heap/heap-inl.h" // For Page/MemoryChunk. TODO(jkummerow): Drop. +#include "src/logging/counters.h" #include "src/objects/api-callbacks.h" #include "src/objects/cell.h" #include "src/objects/descriptor-array.h" diff --git a/src/compilation-cache.cc b/src/compilation-cache.cc index e210dd4025..ccf3e155f9 100644 --- a/src/compilation-cache.cc +++ b/src/compilation-cache.cc @@ -4,10 +4,10 @@ #include "src/compilation-cache.h" -#include "src/counters.h" #include "src/globals.h" #include "src/heap/factory.h" -#include "src/log.h" +#include "src/logging/counters.h" +#include "src/logging/log.h" #include "src/objects-inl.h" #include "src/objects/compilation-cache-inl.h" #include "src/objects/slots.h" diff --git a/src/compiler-dispatcher/optimizing-compile-dispatcher.cc b/src/compiler-dispatcher/optimizing-compile-dispatcher.cc index b84949acf7..ebc90a0a0f 100644 --- a/src/compiler-dispatcher/optimizing-compile-dispatcher.cc +++ b/src/compiler-dispatcher/optimizing-compile-dispatcher.cc @@ -8,9 +8,9 @@ #include "src/base/template-utils.h" #include "src/cancelable-task.h" #include "src/compiler.h" -#include "src/counters.h" #include "src/isolate.h" -#include "src/log.h" +#include "src/logging/counters.h" +#include "src/logging/log.h" #include "src/objects-inl.h" #include "src/optimized-compilation-info.h" #include "src/tracing/trace-event.h" diff --git a/src/compiler.cc b/src/compiler.cc index 8d867be589..801ecd7885 100644 --- a/src/compiler.cc +++ b/src/compiler.cc @@ -25,7 +25,7 @@ #include "src/init/bootstrapper.h" #include "src/interpreter/interpreter.h" #include "src/isolate-inl.h" -#include "src/log-inl.h" +#include "src/logging/log-inl.h" #include "src/message-template.h" #include "src/objects/feedback-cell-inl.h" #include "src/objects/map.h" diff --git a/src/compiler/access-info.cc b/src/compiler/access-info.cc index bb25c6909c..ed12578735 100644 --- a/src/compiler/access-info.cc +++ b/src/compiler/access-info.cc @@ -9,8 +9,8 @@ #include "src/accessors.h" #include "src/compiler/compilation-dependencies.h" #include "src/compiler/type-cache.h" -#include "src/counters.h" #include "src/ic/call-optimization.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" #include "src/objects/cell-inl.h" #include "src/objects/field-index-inl.h" diff --git a/src/compiler/backend/arm/unwinding-info-writer-arm.h b/src/compiler/backend/arm/unwinding-info-writer-arm.h index 237abe40ab..1b60e8aeca 100644 --- a/src/compiler/backend/arm/unwinding-info-writer-arm.h +++ b/src/compiler/backend/arm/unwinding-info-writer-arm.h @@ -5,7 +5,7 @@ #ifndef V8_COMPILER_BACKEND_ARM_UNWINDING_INFO_WRITER_ARM_H_ #define V8_COMPILER_BACKEND_ARM_UNWINDING_INFO_WRITER_ARM_H_ -#include "src/eh-frame.h" +#include "src/diagnostics/eh-frame.h" #include "src/flags.h" namespace v8 { diff --git a/src/compiler/backend/arm64/unwinding-info-writer-arm64.h b/src/compiler/backend/arm64/unwinding-info-writer-arm64.h index 6b67f0ff64..6674cbb655 100644 --- a/src/compiler/backend/arm64/unwinding-info-writer-arm64.h +++ b/src/compiler/backend/arm64/unwinding-info-writer-arm64.h @@ -5,7 +5,7 @@ #ifndef V8_COMPILER_BACKEND_ARM64_UNWINDING_INFO_WRITER_ARM64_H_ #define V8_COMPILER_BACKEND_ARM64_UNWINDING_INFO_WRITER_ARM64_H_ -#include "src/eh-frame.h" +#include "src/diagnostics/eh-frame.h" #include "src/flags.h" namespace v8 { diff --git a/src/compiler/backend/code-generator.cc b/src/compiler/backend/code-generator.cc index 56a80fa1d7..73908323dc 100644 --- a/src/compiler/backend/code-generator.cc +++ b/src/compiler/backend/code-generator.cc @@ -11,10 +11,10 @@ #include "src/compiler/linkage.h" #include "src/compiler/pipeline.h" #include "src/compiler/wasm-compiler.h" -#include "src/counters.h" -#include "src/eh-frame.h" +#include "src/diagnostics/eh-frame.h" #include "src/frames.h" -#include "src/log.h" +#include "src/logging/counters.h" +#include "src/logging/log.h" #include "src/macro-assembler-inl.h" #include "src/objects/smi.h" #include "src/optimized-compilation-info.h" diff --git a/src/compiler/backend/x64/unwinding-info-writer-x64.h b/src/compiler/backend/x64/unwinding-info-writer-x64.h index f460cbca99..2d649d62cc 100644 --- a/src/compiler/backend/x64/unwinding-info-writer-x64.h +++ b/src/compiler/backend/x64/unwinding-info-writer-x64.h @@ -5,7 +5,7 @@ #ifndef V8_COMPILER_BACKEND_X64_UNWINDING_INFO_WRITER_X64_H_ #define V8_COMPILER_BACKEND_X64_UNWINDING_INFO_WRITER_X64_H_ -#include "src/eh-frame.h" +#include "src/diagnostics/eh-frame.h" #include "src/flags.h" namespace v8 { diff --git a/src/compiler/basic-block-instrumentor.h b/src/compiler/basic-block-instrumentor.h index 620f38d535..bc5a475cf2 100644 --- a/src/compiler/basic-block-instrumentor.h +++ b/src/compiler/basic-block-instrumentor.h @@ -6,7 +6,7 @@ #define V8_COMPILER_BASIC_BLOCK_INSTRUMENTOR_H_ #include "src/allocation.h" -#include "src/basic-block-profiler.h" +#include "src/diagnostics/basic-block-profiler.h" namespace v8 { namespace internal { diff --git a/src/compiler/js-call-reducer.cc b/src/compiler/js-call-reducer.cc index 9db8e96f13..82ddd8f5f2 100644 --- a/src/compiler/js-call-reducer.cc +++ b/src/compiler/js-call-reducer.cc @@ -21,9 +21,9 @@ #include "src/compiler/property-access-builder.h" #include "src/compiler/simplified-operator.h" #include "src/compiler/type-cache.h" -#include "src/counters.h" #include "src/feedback-vector-inl.h" #include "src/ic/call-optimization.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" #include "src/objects/arguments-inl.h" #include "src/objects/js-array-buffer-inl.h" diff --git a/src/compiler/js-intrinsic-lowering.cc b/src/compiler/js-intrinsic-lowering.cc index a143eda758..48e1028e87 100644 --- a/src/compiler/js-intrinsic-lowering.cc +++ b/src/compiler/js-intrinsic-lowering.cc @@ -13,7 +13,7 @@ #include "src/compiler/node-matchers.h" #include "src/compiler/node-properties.h" #include "src/compiler/operator-properties.h" -#include "src/counters.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" #include "src/objects/js-generator.h" diff --git a/src/compiler/pipeline.cc b/src/compiler/pipeline.cc index 24bfac8623..de4dd9791f 100644 --- a/src/compiler/pipeline.cc +++ b/src/compiler/pipeline.cc @@ -76,7 +76,7 @@ #include "src/compiler/verifier.h" #include "src/compiler/wasm-compiler.h" #include "src/compiler/zone-stats.h" -#include "src/disassembler.h" +#include "src/diagnostics/disassembler.h" #include "src/init/bootstrapper.h" #include "src/isolate-inl.h" #include "src/objects/shared-function-info.h" diff --git a/src/compiler/wasm-compiler.cc b/src/compiler/wasm-compiler.cc index 39959fd9f8..e522d3f593 100644 --- a/src/compiler/wasm-compiler.cc +++ b/src/compiler/wasm-compiler.cc @@ -31,11 +31,11 @@ #include "src/compiler/pipeline.h" #include "src/compiler/simd-scalar-lowering.h" #include "src/compiler/zone-stats.h" -#include "src/counters.h" #include "src/heap/factory.h" #include "src/interface-descriptors.h" #include "src/isolate-inl.h" -#include "src/log.h" +#include "src/logging/counters.h" +#include "src/logging/log.h" #include "src/objects/heap-number.h" #include "src/optimized-compilation-info.h" #include "src/tracing/trace-event.h" diff --git a/src/d8/d8.cc b/src/d8/d8.cc index c5a9031bb2..a824f064b5 100644 --- a/src/d8/d8.cc +++ b/src/d8/d8.cc @@ -27,11 +27,11 @@ #include "src/base/platform/platform.h" #include "src/base/platform/time.h" #include "src/base/sys-info.h" -#include "src/basic-block-profiler.h" #include "src/d8/d8-console.h" #include "src/d8/d8-platforms.h" #include "src/d8/d8.h" #include "src/debug/debug-interface.h" +#include "src/diagnostics/basic-block-profiler.h" #include "src/interpreter/interpreter.h" #include "src/msan.h" #include "src/objects-inl.h" diff --git a/src/debug/debug.cc b/src/debug/debug.cc index a72d57d52f..3484061902 100644 --- a/src/debug/debug.cc +++ b/src/debug/debug.cc @@ -15,7 +15,6 @@ #include "src/builtins/builtins.h" #include "src/compilation-cache.h" #include "src/compiler.h" -#include "src/counters.h" #include "src/debug/debug-evaluate.h" #include "src/debug/liveedit.h" #include "src/deoptimizer.h" @@ -29,6 +28,7 @@ #include "src/interpreter/bytecode-array-iterator.h" #include "src/interpreter/interpreter.h" #include "src/isolate-inl.h" +#include "src/logging/counters.h" #include "src/message-template.h" #include "src/objects/api-callbacks-inl.h" #include "src/objects/debug-objects-inl.h" diff --git a/src/debug/liveedit.cc b/src/debug/liveedit.cc index 03683a1b2d..7233762a72 100644 --- a/src/debug/liveedit.cc +++ b/src/debug/liveedit.cc @@ -14,7 +14,7 @@ #include "src/debug/debug.h" #include "src/frames-inl.h" #include "src/isolate-inl.h" -#include "src/log.h" +#include "src/logging/log.h" #include "src/objects-inl.h" #include "src/objects/hash-table-inl.h" #include "src/objects/js-generator-inl.h" diff --git a/src/deoptimizer.cc b/src/deoptimizer.cc index 8a4714ff91..594bd203ea 100644 --- a/src/deoptimizer.cc +++ b/src/deoptimizer.cc @@ -10,13 +10,13 @@ #include "src/assembler-inl.h" #include "src/ast/prettyprinter.h" #include "src/callable.h" -#include "src/counters.h" -#include "src/disasm.h" +#include "src/diagnostics/disasm.h" #include "src/frames-inl.h" #include "src/global-handles.h" #include "src/heap/heap-inl.h" #include "src/interpreter/interpreter.h" -#include "src/log.h" +#include "src/logging/counters.h" +#include "src/logging/log.h" #include "src/macro-assembler.h" #include "src/objects/debug-objects-inl.h" #include "src/objects/heap-number-inl.h" diff --git a/src/diagnostics/OWNERS b/src/diagnostics/OWNERS new file mode 100644 index 0000000000..852d438bb0 --- /dev/null +++ b/src/diagnostics/OWNERS @@ -0,0 +1 @@ +file://COMMON_OWNERS diff --git a/src/basic-block-profiler.cc b/src/diagnostics/basic-block-profiler.cc similarity index 96% rename from src/basic-block-profiler.cc rename to src/diagnostics/basic-block-profiler.cc index 444c2bb397..820f24b2d3 100644 --- a/src/basic-block-profiler.cc +++ b/src/diagnostics/basic-block-profiler.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "src/basic-block-profiler.h" +#include "src/diagnostics/basic-block-profiler.h" #include #include @@ -51,7 +51,6 @@ intptr_t BasicBlockProfiler::Data::GetCounterAddress(size_t offset) { return reinterpret_cast(&(counts_[offset])); } - void BasicBlockProfiler::Data::ResetCounts() { for (size_t i = 0; i < n_blocks_; ++i) { counts_[i] = 0; @@ -65,21 +64,18 @@ BasicBlockProfiler::Data* BasicBlockProfiler::NewData(size_t n_blocks) { return data; } - BasicBlockProfiler::~BasicBlockProfiler() { for (DataList::iterator i = data_list_.begin(); i != data_list_.end(); ++i) { delete (*i); } } - void BasicBlockProfiler::ResetCounts() { for (DataList::iterator i = data_list_.begin(); i != data_list_.end(); ++i) { (*i)->ResetCounts(); } } - std::ostream& operator<<(std::ostream& os, const BasicBlockProfiler& p) { os << "---- Start Profiling Data ----" << std::endl; typedef BasicBlockProfiler::DataList::const_iterator iterator; @@ -90,7 +86,6 @@ std::ostream& operator<<(std::ostream& os, const BasicBlockProfiler& p) { return os; } - std::ostream& operator<<(std::ostream& os, const BasicBlockProfiler::Data& d) { int block_count_sum = std::accumulate(d.counts_.begin(), d.counts_.end(), 0); if (block_count_sum == 0) return os; @@ -112,8 +107,7 @@ std::ostream& operator<<(std::ostream& os, const BasicBlockProfiler::Data& d) { std::sort(pairs.begin(), pairs.end(), [=](std::pair left, std::pair right) { - if (right.second == left.second) - return left.first < right.first; + if (right.second == left.second) return left.first < right.first; return right.second < left.second; }); for (auto it : pairs) { diff --git a/src/basic-block-profiler.h b/src/diagnostics/basic-block-profiler.h similarity index 93% rename from src/basic-block-profiler.h rename to src/diagnostics/basic-block-profiler.h index 86295253c7..3c8ae89c0a 100644 --- a/src/basic-block-profiler.h +++ b/src/diagnostics/basic-block-profiler.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_BASIC_BLOCK_PROFILER_H_ -#define V8_BASIC_BLOCK_PROFILER_H_ +#ifndef V8_DIAGNOSTICS_BASIC_BLOCK_PROFILER_H_ +#define V8_DIAGNOSTICS_BASIC_BLOCK_PROFILER_H_ #include #include @@ -77,4 +77,4 @@ std::ostream& operator<<(std::ostream& os, const BasicBlockProfiler::Data& s); } // namespace internal } // namespace v8 -#endif // V8_BASIC_BLOCK_PROFILER_H_ +#endif // V8_DIAGNOSTICS_BASIC_BLOCK_PROFILER_H_ diff --git a/src/disasm.h b/src/diagnostics/disasm.h similarity index 96% rename from src/disasm.h rename to src/diagnostics/disasm.h index f543af2609..2fe14f1932 100644 --- a/src/disasm.h +++ b/src/diagnostics/disasm.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_DISASM_H_ -#define V8_DISASM_H_ +#ifndef V8_DIAGNOSTICS_DISASM_H_ +#define V8_DIAGNOSTICS_DISASM_H_ #include "src/vector.h" @@ -78,4 +78,4 @@ class Disassembler { } // namespace disasm -#endif // V8_DISASM_H_ +#endif // V8_DIAGNOSTICS_DISASM_H_ diff --git a/src/disassembler.cc b/src/diagnostics/disassembler.cc similarity index 98% rename from src/disassembler.cc rename to src/diagnostics/disassembler.cc index ebc831343a..05f5ca18e7 100644 --- a/src/disassembler.cc +++ b/src/diagnostics/disassembler.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "src/disassembler.h" +#include "src/diagnostics/disassembler.h" #include #include @@ -13,7 +13,7 @@ #include "src/code-reference.h" #include "src/debug/debug.h" #include "src/deoptimizer.h" -#include "src/disasm.h" +#include "src/diagnostics/disasm.h" #include "src/ic/ic.h" #include "src/isolate-data.h" #include "src/macro-assembler.h" @@ -30,7 +30,7 @@ namespace internal { #ifdef ENABLE_DISASSEMBLER -class V8NameConverter: public disasm::NameConverter { +class V8NameConverter : public disasm::NameConverter { public: explicit V8NameConverter(Isolate* isolate, CodeReference code = {}) : isolate_(isolate), code_(code) {} @@ -108,7 +108,6 @@ const char* V8NameConverter::NameOfAddress(byte* pc) const { return disasm::NameConverter::NameOfAddress(pc); } - const char* V8NameConverter::NameInCode(byte* addr) const { // The V8NameConverter is used for well known code, so we can "safely" // dereference pointers in generated code. @@ -188,7 +187,6 @@ static void DumpBuffer(std::ostream* os, StringBuilder* out) { out->Reset(); } - static const int kOutBufferSize = 2048 + String::kMaxShortPrintLength; static const int kRelocInfoPosition = 57; @@ -293,8 +291,7 @@ static int DecodeIt(Isolate* isolate, ExternalReferenceEncoder* ref_encoder, // First decode instruction so that we know its length. byte* prev_pc = pc; if (constants > 0) { - SNPrintF(decode_buffer, - "%08x constant", + SNPrintF(decode_buffer, "%08x constant", *reinterpret_cast(pc)); constants--; pc += 4; @@ -381,8 +378,7 @@ static int DecodeIt(Isolate* isolate, ExternalReferenceEncoder* ref_encoder, // already, check if we can find some RelocInfo for the target address in // the constant pool. if (pcs.empty() && !code.is_null()) { - RelocInfo dummy_rinfo(reinterpret_cast
(prev_pc), - RelocInfo::NONE, + RelocInfo dummy_rinfo(reinterpret_cast
(prev_pc), RelocInfo::NONE, 0, Code()); if (dummy_rinfo.IsInConstantPool()) { Address constant_pool_entry_address = diff --git a/src/disassembler.h b/src/diagnostics/disassembler.h similarity index 89% rename from src/disassembler.h rename to src/diagnostics/disassembler.h index d6bb84cd27..1bb326655a 100644 --- a/src/disassembler.h +++ b/src/diagnostics/disassembler.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_DISASSEMBLER_H_ -#define V8_DISASSEMBLER_H_ +#ifndef V8_DIAGNOSTICS_DISASSEMBLER_H_ +#define V8_DIAGNOSTICS_DISASSEMBLER_H_ #include "src/allocation.h" #include "src/code-reference.h" @@ -29,4 +29,4 @@ class Disassembler : public AllStatic { } // namespace internal } // namespace v8 -#endif // V8_DISASSEMBLER_H_ +#endif // V8_DIAGNOSTICS_DISASSEMBLER_H_ diff --git a/src/eh-frame.cc b/src/diagnostics/eh-frame.cc similarity index 98% rename from src/eh-frame.cc rename to src/diagnostics/eh-frame.cc index 37a176557d..f13718deda 100644 --- a/src/eh-frame.cc +++ b/src/diagnostics/eh-frame.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "src/eh-frame.h" +#include "src/diagnostics/eh-frame.h" #include #include @@ -493,8 +493,9 @@ void EhFrameDisassembler::DumpDwarfDirectives(std::ostream& stream, // NOLINT if (((bytecode >> EhFrameConstants::kSavedRegisterMaskSize) & 0xFF) == EhFrameConstants::kSavedRegisterTag) { int32_t decoded_offset = eh_frame_iterator.GetNextULeb128(); - stream << "| " << DwarfRegisterCodeToString( - bytecode & EhFrameConstants::kLocationMask) + stream << "| " + << DwarfRegisterCodeToString(bytecode & + EhFrameConstants::kLocationMask) << " saved at base" << std::showpos << decoded_offset * EhFrameConstants::kDataAlignmentFactor << std::noshowpos << '\n'; @@ -503,8 +504,9 @@ void EhFrameDisassembler::DumpDwarfDirectives(std::ostream& stream, // NOLINT if (((bytecode >> EhFrameConstants::kFollowInitialRuleMaskSize) & 0xFF) == EhFrameConstants::kFollowInitialRuleTag) { - stream << "| " << DwarfRegisterCodeToString( - bytecode & EhFrameConstants::kLocationMask) + stream << "| " + << DwarfRegisterCodeToString(bytecode & + EhFrameConstants::kLocationMask) << " follows rule in CIE\n"; continue; } diff --git a/src/eh-frame.h b/src/diagnostics/eh-frame.h similarity index 98% rename from src/eh-frame.h rename to src/diagnostics/eh-frame.h index 1f1fb8ea3d..0a9189cdb7 100644 --- a/src/eh-frame.h +++ b/src/diagnostics/eh-frame.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_EH_FRAME_H_ -#define V8_EH_FRAME_H_ +#ifndef V8_DIAGNOSTICS_EH_FRAME_H_ +#define V8_DIAGNOSTICS_EH_FRAME_H_ #include "src/base/compiler-specific.h" #include "src/globals.h" @@ -305,4 +305,4 @@ class EhFrameDisassembler final { } // namespace internal } // namespace v8 -#endif // V8_EH_FRAME_H_ +#endif // V8_DIAGNOSTICS_EH_FRAME_H_ diff --git a/src/gdb-jit.cc b/src/diagnostics/gdb-jit.cc similarity index 88% rename from src/gdb-jit.cc rename to src/diagnostics/gdb-jit.cc index 031fc03484..2f0f836b57 100644 --- a/src/gdb-jit.cc +++ b/src/diagnostics/gdb-jit.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "src/gdb-jit.h" +#include "src/diagnostics/gdb-jit.h" #include #include @@ -47,58 +47,47 @@ class Writer { : debug_object_(debug_object), position_(0), capacity_(1024), - buffer_(reinterpret_cast(malloc(capacity_))) { - } + buffer_(reinterpret_cast(malloc(capacity_))) {} - ~Writer() { - free(buffer_); - } + ~Writer() { free(buffer_); } - uintptr_t position() const { - return position_; - } + uintptr_t position() const { return position_; } - template + template class Slot { public: - Slot(Writer* w, uintptr_t offset) : w_(w), offset_(offset) { } + Slot(Writer* w, uintptr_t offset) : w_(w), offset_(offset) {} - T* operator-> () { - return w_->RawSlotAt(offset_); - } + T* operator->() { return w_->RawSlotAt(offset_); } - void set(const T& value) { - *w_->RawSlotAt(offset_) = value; - } + void set(const T& value) { *w_->RawSlotAt(offset_) = value; } - Slot at(int i) { - return Slot(w_, offset_ + sizeof(T) * i); - } + Slot at(int i) { return Slot(w_, offset_ + sizeof(T) * i); } private: Writer* w_; uintptr_t offset_; }; - template + template void Write(const T& val) { Ensure(position_ + sizeof(T)); *RawSlotAt(position_) = val; position_ += sizeof(T); } - template + template Slot SlotAt(uintptr_t offset) { Ensure(offset + sizeof(T)); return Slot(this, offset); } - template + template Slot CreateSlotHere() { return CreateSlotsHere(1); } - template + template Slot CreateSlotsHere(uint32_t count) { uintptr_t slot_position = position_; position_ += sizeof(T) * count; @@ -158,9 +147,10 @@ class Writer { } private: - template friend class Slot; + template + friend class Slot; - template + template T* RawSlotAt(uintptr_t offset) { DCHECK(offset < capacity_ && offset + sizeof(T) <= capacity_); return reinterpret_cast(&buffer_[offset]); @@ -174,7 +164,7 @@ class Writer { class ELFStringTable; -template +template class DebugSectionBase : public ZoneObject { public: virtual ~DebugSectionBase() = default; @@ -191,14 +181,11 @@ class DebugSectionBase : public ZoneObject { } } - virtual bool WriteBodyInternal(Writer* writer) { - return false; - } + virtual bool WriteBodyInternal(Writer* writer) { return false; } typedef THeader Header; }; - struct MachOSectionHeader { char sectname[16]; char segname[16]; @@ -218,7 +205,6 @@ struct MachOSectionHeader { uint32_t reserved2; }; - class MachOSection : public DebugSectionBase { public: enum Type { @@ -265,7 +251,6 @@ class MachOSection : public DebugSectionBase { uint32_t flags_; }; - struct ELFSectionHeader { uint32_t name; uint32_t type; @@ -279,7 +264,6 @@ struct ELFSectionHeader { uintptr_t entry_size; }; - #if defined(__ELF) class ELFSection : public DebugSectionBase { public: @@ -303,16 +287,12 @@ class ELFSection : public DebugSectionBase { TYPE_HIUSER = 0xFFFFFFFF }; - enum Flags { - FLAG_WRITE = 1, - FLAG_ALLOC = 2, - FLAG_EXEC = 4 - }; + enum Flags { FLAG_WRITE = 1, FLAG_ALLOC = 2, FLAG_EXEC = 4 }; enum SpecialIndexes { INDEX_ABSOLUTE = 0xFFF1 }; ELFSection(const char* name, Type type, uintptr_t align) - : name_(name), type_(type), align_(align) { } + : name_(name), type_(type), align_(align) {} ~ELFSection() override = default; @@ -351,7 +331,6 @@ class ELFSection : public DebugSectionBase { }; #endif // defined(__ELF) - #if defined(__MACH_O) class MachOTextSection : public MachOSection { public: @@ -376,22 +355,17 @@ class MachOTextSection : public MachOSection { }; #endif // defined(__MACH_O) - #if defined(__ELF) class FullHeaderELFSection : public ELFSection { public: - FullHeaderELFSection(const char* name, - Type type, - uintptr_t align, - uintptr_t addr, - uintptr_t offset, - uintptr_t size, + FullHeaderELFSection(const char* name, Type type, uintptr_t align, + uintptr_t addr, uintptr_t offset, uintptr_t size, uintptr_t flags) : ELFSection(name, type, align), addr_(addr), offset_(offset), size_(size), - flags_(flags) { } + flags_(flags) {} protected: void PopulateHeader(Writer::Slot
header) override { @@ -409,7 +383,6 @@ class FullHeaderELFSection : public ELFSection { uintptr_t flags_; }; - class ELFStringTable : public ELFSection { public: explicit ELFStringTable(const char* name) @@ -458,7 +431,6 @@ class ELFStringTable : public ELFSection { uintptr_t size_; }; - void ELFSection::PopulateHeader(Writer::Slot header, ELFStringTable* strtab) { header->name = static_cast(strtab->Add(name_)); @@ -468,7 +440,6 @@ void ELFSection::PopulateHeader(Writer::Slot header, } #endif // defined(__ELF) - #if defined(__MACH_O) class MachO { public: @@ -482,9 +453,8 @@ class MachO { void Write(Writer* w, uintptr_t code_start, uintptr_t code_size) { Writer::Slot header = WriteHeader(w); uintptr_t load_command_start = w->position(); - Writer::Slot cmd = WriteSegmentCommand(w, - code_start, - code_size); + Writer::Slot cmd = + WriteSegmentCommand(w, code_start, code_size); WriteSections(w, cmd, header, load_command_start); } @@ -528,18 +498,17 @@ class MachO { LC_SEGMENT_64 = 0x00000019u }; - Writer::Slot WriteHeader(Writer* w) { DCHECK_EQ(w->position(), 0); Writer::Slot header = w->CreateSlotHere(); #if V8_TARGET_ARCH_IA32 header->magic = 0xFEEDFACEu; - header->cputype = 7; // i386 + header->cputype = 7; // i386 header->cpusubtype = 3; // CPU_SUBTYPE_I386_ALL #elif V8_TARGET_ARCH_X64 header->magic = 0xFEEDFACFu; header->cputype = 7 | 0x01000000; // i386 | 64-bit ABI - header->cpusubtype = 3; // CPU_SUBTYPE_I386_ALL + header->cpusubtype = 3; // CPU_SUBTYPE_I386_ALL header->reserved = 0; #else #error Unsupported target architecture. @@ -551,7 +520,6 @@ class MachO { return header; } - Writer::Slot WriteSegmentCommand(Writer* w, uintptr_t code_start, uintptr_t code_size) { @@ -571,14 +539,12 @@ class MachO { cmd->flags = 0; cmd->nsects = static_cast(sections_.size()); memset(cmd->segname, 0, 16); - cmd->cmdsize = sizeof(MachOSegmentCommand) + sizeof(MachOSection::Header) * - cmd->nsects; + cmd->cmdsize = sizeof(MachOSegmentCommand) + + sizeof(MachOSection::Header) * cmd->nsects; return cmd; } - - void WriteSections(Writer* w, - Writer::Slot cmd, + void WriteSections(Writer* w, Writer::Slot cmd, Writer::Slot header, uintptr_t load_command_start) { Writer::Slot headers = @@ -600,7 +566,6 @@ class MachO { }; #endif // defined(__MACH_O) - #if defined(__ELF) class ELF { public: @@ -641,15 +606,14 @@ class ELF { uint16_t sht_strtab_index; }; - void WriteHeader(Writer* w) { DCHECK_EQ(w->position(), 0); Writer::Slot header = w->CreateSlotHere(); #if (V8_TARGET_ARCH_IA32 || V8_TARGET_ARCH_ARM) const uint8_t ident[16] = {0x7F, 'E', 'L', 'F', 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}; -#elif(V8_TARGET_ARCH_X64 && V8_TARGET_ARCH_64_BIT) || \ - (V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN) +#elif V8_TARGET_ARCH_X64 && V8_TARGET_ARCH_64_BIT || \ + V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN const uint8_t ident[16] = {0x7F, 'E', 'L', 'F', 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}; #elif V8_TARGET_ARCH_PPC64 && V8_TARGET_BIG_ENDIAN && V8_OS_LINUX @@ -763,39 +727,27 @@ class ELFSymbol { BIND_HIPROC = 15 }; - ELFSymbol(const char* name, - uintptr_t value, - uintptr_t size, - Binding binding, - Type type, - uint16_t section) + ELFSymbol(const char* name, uintptr_t value, uintptr_t size, Binding binding, + Type type, uint16_t section) : name(name), value(value), size(size), info((binding << 4) | type), other(0), - section(section) { - } + section(section) {} - Binding binding() const { - return static_cast(info >> 4); - } -#if (V8_TARGET_ARCH_IA32 || V8_TARGET_ARCH_ARM || \ + Binding binding() const { return static_cast(info >> 4); } +#if (V8_TARGET_ARCH_IA32 || V8_TARGET_ARCH_ARM || \ (V8_TARGET_ARCH_S390 && V8_TARGET_ARCH_32_BIT)) struct SerializedLayout { - SerializedLayout(uint32_t name, - uintptr_t value, - uintptr_t size, - Binding binding, - Type type, - uint16_t section) + SerializedLayout(uint32_t name, uintptr_t value, uintptr_t size, + Binding binding, Type type, uint16_t section) : name(name), value(value), size(size), info((binding << 4) | type), other(0), - section(section) { - } + section(section) {} uint32_t name; uintptr_t value; @@ -804,22 +756,17 @@ class ELFSymbol { uint8_t other; uint16_t section; }; -#elif(V8_TARGET_ARCH_X64 && V8_TARGET_ARCH_64_BIT) || \ - (V8_TARGET_ARCH_PPC64 && V8_OS_LINUX) || V8_TARGET_ARCH_S390X +#elif V8_TARGET_ARCH_X64 && V8_TARGET_ARCH_64_BIT || \ + V8_TARGET_ARCH_PPC64 && V8_OS_LINUX || V8_TARGET_ARCH_S390X struct SerializedLayout { - SerializedLayout(uint32_t name, - uintptr_t value, - uintptr_t size, - Binding binding, - Type type, - uint16_t section) + SerializedLayout(uint32_t name, uintptr_t value, uintptr_t size, + Binding binding, Type type, uint16_t section) : name(name), info((binding << 4) | type), other(0), section(section), value(value), - size(size) { - } + size(size) {} uint32_t name; uint8_t info; @@ -849,7 +796,6 @@ class ELFSymbol { uint16_t section; }; - class ELFSymbolTable : public ELFSection { public: ELFSymbolTable(const char* name, Zone* zone) @@ -872,12 +818,8 @@ class ELFSymbolTable : public ELFSection { ELFStringTable* strtab = static_cast(w->debug_object()->SectionAt(index() + 1)); strtab->AttachWriter(w); - symbols.at(0).set(ELFSymbol::SerializedLayout(0, - 0, - 0, - ELFSymbol::BIND_LOCAL, - ELFSymbol::TYPE_NOTYPE, - 0)); + symbols.at(0).set(ELFSymbol::SerializedLayout( + 0, 0, 0, ELFSymbol::BIND_LOCAL, ELFSymbol::TYPE_NOTYPE, 0)); WriteSymbolsList(&locals_, symbols.at(1), strtab); WriteSymbolsList(&globals_, symbols.at(static_cast(locals_.size() + 1)), @@ -917,7 +859,6 @@ class ELFSymbolTable : public ELFSection { }; #endif // defined(__ELF) - class LineInfo : public Malloced { public: void SetPosition(intptr_t pc, int pos, bool is_statement) { @@ -956,9 +897,7 @@ class CodeDescription { LineInfo* lineinfo) : name_(name), code_(code), shared_info_(shared), lineinfo_(lineinfo) {} - const char* name() const { - return name_; - } + const char* name() const { return name_; } LineInfo* lineinfo() const { return lineinfo_; } @@ -982,9 +921,7 @@ class CodeDescription { return static_cast(code_->InstructionEnd()); } - uintptr_t CodeSize() const { - return CodeEnd() - CodeStart(); - } + uintptr_t CodeSize() const { return CodeEnd() - CodeStart(); } bool has_script() { return !shared_info_.is_null() && shared_info_->script()->IsScript(); @@ -1037,8 +974,8 @@ class CodeDescription { #if defined(__ELF) static void CreateSymbolsTable(CodeDescription* desc, Zone* zone, ELF* elf, size_t text_section_index) { - ELFSymbolTable* symtab = new(zone) ELFSymbolTable(".symtab", zone); - ELFStringTable* strtab = new(zone) ELFStringTable(".strtab"); + ELFSymbolTable* symtab = new (zone) ELFSymbolTable(".symtab", zone); + ELFStringTable* strtab = new (zone) ELFStringTable(".strtab"); // Symbol table should be followed by the linked string table. elf->AddSection(symtab); @@ -1053,19 +990,17 @@ static void CreateSymbolsTable(CodeDescription* desc, Zone* zone, ELF* elf, } #endif // defined(__ELF) - class DebugInfoSection : public DebugSection { public: explicit DebugInfoSection(CodeDescription* desc) #if defined(__ELF) : ELFSection(".debug_info", TYPE_PROGBITS, 1), #else - : MachOSection("__debug_info", - "__DWARF", - 1, + : MachOSection("__debug_info", "__DWARF", 1, MachOSection::S_REGULAR | MachOSection::S_ATTR_DEBUG), #endif - desc_(desc) { } + desc_(desc) { + } // DWARF2 standard enum DWARF2LocationOp { @@ -1104,10 +1039,7 @@ class DebugInfoSection : public DebugSection { DW_OP_fbreg = 0x91 // 1 param: SLEB128 offset }; - enum DWARF2Encoding { - DW_ATE_ADDRESS = 0x1, - DW_ATE_SIGNED = 0x5 - }; + enum DWARF2Encoding { DW_ATE_ADDRESS = 0x1, DW_ATE_SIGNED = 0x5 }; bool WriteBodyInternal(Writer* w) override { uintptr_t cu_start = w->position(); @@ -1193,9 +1125,7 @@ class DebugInfoSection : public DebugSection { w->WriteULEB128(current_abbreviation++); w->WriteString(".native_context"); - for (int context_slot = 0; - context_slot < context_slots; - ++context_slot) { + for (int context_slot = 0; context_slot < context_slots; ++context_slot) { w->WriteULEB128(current_abbreviation++); builder.Reset(); builder.AddFormatted("context_slot%d", context_slot + internal_slots); @@ -1236,19 +1166,17 @@ class DebugInfoSection : public DebugSection { CodeDescription* desc_; }; - class DebugAbbrevSection : public DebugSection { public: explicit DebugAbbrevSection(CodeDescription* desc) #ifdef __ELF : ELFSection(".debug_abbrev", TYPE_PROGBITS, 1), #else - : MachOSection("__debug_abbrev", - "__DWARF", - 1, + : MachOSection("__debug_abbrev", "__DWARF", 1, MachOSection::S_REGULAR | MachOSection::S_ATTR_DEBUG), #endif - desc_(desc) { } + desc_(desc) { + } // DWARF2 standard, figure 14. enum DWARF2Tags { @@ -1262,10 +1190,7 @@ class DebugAbbrevSection : public DebugSection { }; // DWARF2 standard, figure 16. - enum DWARF2ChildrenDetermination { - DW_CHILDREN_NO = 0, - DW_CHILDREN_YES = 1 - }; + enum DWARF2ChildrenDetermination { DW_CHILDREN_NO = 0, DW_CHILDREN_YES = 1 }; // DWARF standard, figure 17. enum DWARF2Attribute { @@ -1292,10 +1217,8 @@ class DebugAbbrevSection : public DebugSection { DW_FORM_REF4 = 0x13 }; - void WriteVariableAbbreviation(Writer* w, - int abbreviation_code, - bool has_value, - bool is_parameter) { + void WriteVariableAbbreviation(Writer* w, int abbreviation_code, + bool has_value, bool is_parameter) { w->WriteULEB128(abbreviation_code); w->WriteULEB128(is_parameter ? DW_TAG_FORMAL_PARAMETER : DW_TAG_VARIABLE); w->Write(DW_CHILDREN_NO); @@ -1368,15 +1291,12 @@ class DebugAbbrevSection : public DebugSection { WriteVariableAbbreviation(w, current_abbreviation++, true, true); } - for (int internal_slot = 0; - internal_slot < internal_slots; + for (int internal_slot = 0; internal_slot < internal_slots; ++internal_slot) { WriteVariableAbbreviation(w, current_abbreviation++, false, false); } - for (int context_slot = 0; - context_slot < context_slots; - ++context_slot) { + for (int context_slot = 0; context_slot < context_slots; ++context_slot) { WriteVariableAbbreviation(w, current_abbreviation++, false, false); } @@ -1397,19 +1317,17 @@ class DebugAbbrevSection : public DebugSection { CodeDescription* desc_; }; - class DebugLineSection : public DebugSection { public: explicit DebugLineSection(CodeDescription* desc) #ifdef __ELF : ELFSection(".debug_line", TYPE_PROGBITS, 1), #else - : MachOSection("__debug_line", - "__DWARF", - 1, + : MachOSection("__debug_line", "__DWARF", 1, MachOSection::S_REGULAR | MachOSection::S_ATTR_DEBUG), #endif - desc_(desc) { } + desc_(desc) { + } // DWARF2 standard, figure 34. enum DWARF2Opcodes { @@ -1442,22 +1360,22 @@ class DebugLineSection : public DebugSection { w->Write(2); // Field version. Writer::Slot prologue_length = w->CreateSlotHere(); uintptr_t prologue_start = w->position(); - w->Write(1); // Field minimum_instruction_length. - w->Write(1); // Field default_is_stmt. - w->Write(line_base); // Field line_base. - w->Write(line_range); // Field line_range. + w->Write(1); // Field minimum_instruction_length. + w->Write(1); // Field default_is_stmt. + w->Write(line_base); // Field line_base. + w->Write(line_range); // Field line_range. w->Write(opcode_base); // Field opcode_base. - w->Write(0); // DW_LNS_COPY operands count. - w->Write(1); // DW_LNS_ADVANCE_PC operands count. - w->Write(1); // DW_LNS_ADVANCE_LINE operands count. - w->Write(1); // DW_LNS_SET_FILE operands count. - w->Write(1); // DW_LNS_SET_COLUMN operands count. - w->Write(0); // DW_LNS_NEGATE_STMT operands count. - w->Write(0); // Empty include_directories sequence. + w->Write(0); // DW_LNS_COPY operands count. + w->Write(1); // DW_LNS_ADVANCE_PC operands count. + w->Write(1); // DW_LNS_ADVANCE_LINE operands count. + w->Write(1); // DW_LNS_SET_FILE operands count. + w->Write(1); // DW_LNS_SET_COLUMN operands count. + w->Write(0); // DW_LNS_NEGATE_STMT operands count. + w->Write(0); // Empty include_directories sequence. w->WriteString(desc_->GetFilename().get()); // File name. - w->WriteULEB128(0); // Current directory. - w->WriteULEB128(0); // Unknown modification time. - w->WriteULEB128(0); // Unknown file size. + w->WriteULEB128(0); // Current directory. + w->WriteULEB128(0); // Unknown modification time. + w->WriteULEB128(0); // Unknown file size. w->Write(0); prologue_length.set(static_cast(w->position() - prologue_start)); @@ -1478,7 +1396,7 @@ class DebugLineSection : public DebugSection { // Reduce bloating in the debug line table by removing duplicate line // entries (per DWARF2 standard). - intptr_t new_line = desc_->GetScriptLineNumber(info->pos_); + intptr_t new_line = desc_->GetScriptLineNumber(info->pos_); if (new_line == line) { continue; } @@ -1503,8 +1421,8 @@ class DebugLineSection : public DebugSection { intptr_t line_diff = new_line - line; // Compute special opcode (see DWARF 2.0 standard) - intptr_t special_opcode = (line_diff - line_base) + - (line_range * pc_diff) + opcode_base; + intptr_t special_opcode = + (line_diff - line_base) + (line_range * pc_diff) + opcode_base; // If special_opcode is less than or equal to 255, it can be used as a // special opcode. If line_diff is larger than the max line increment @@ -1536,8 +1454,7 @@ class DebugLineSection : public DebugSection { } private: - void WriteExtendedOpcode(Writer* w, - DWARF2ExtendedOpcode op, + void WriteExtendedOpcode(Writer* w, DWARF2ExtendedOpcode op, size_t operands_size) { w->Write(0); w->WriteULEB128(operands_size + 1); @@ -1558,7 +1475,6 @@ class DebugLineSection : public DebugSection { CodeDescription* desc_; }; - #if V8_TARGET_ARCH_X64 class UnwindInfoSection : public DebugSection { @@ -1574,8 +1490,7 @@ class UnwindInfoSection : public DebugSection { void WriteFDEStateAfterRBPSet(Writer* w); void WriteFDEStateAfterRBPPop(Writer* w); - void WriteLength(Writer* w, - Writer::Slot* length_slot, + void WriteLength(Writer* w, Writer::Slot* length_slot, int initial_position); private: @@ -1629,7 +1544,6 @@ class UnwindInfoSection : public DebugSection { }; }; - void UnwindInfoSection::WriteLength(Writer* w, Writer::Slot* length_slot, int initial_position) { @@ -1645,7 +1559,6 @@ void UnwindInfoSection::WriteLength(Writer* w, length_slot->set(static_cast(w->position() - initial_position)); } - UnwindInfoSection::UnwindInfoSection(CodeDescription* desc) #ifdef __ELF : ELFSection(".eh_frame", TYPE_X86_64_UNWIND, 1), @@ -1653,7 +1566,8 @@ UnwindInfoSection::UnwindInfoSection(CodeDescription* desc) : MachOSection("__eh_frame", "__TEXT", sizeof(uintptr_t), MachOSection::S_REGULAR), #endif - desc_(desc) { } + desc_(desc) { +} int UnwindInfoSection::WriteCIE(Writer* w) { Writer::Slot cie_length_slot = w->CreateSlotHere(); @@ -1674,7 +1588,6 @@ int UnwindInfoSection::WriteCIE(Writer* w) { return cie_position; } - void UnwindInfoSection::WriteFDE(Writer* w, int cie_position) { // The only FDE for this function. The CFA is the current RBP. Writer::Slot fde_length_slot = w->CreateSlotHere(); @@ -1692,7 +1605,6 @@ void UnwindInfoSection::WriteFDE(Writer* w, int cie_position) { WriteLength(w, &fde_length_slot, fde_position); } - void UnwindInfoSection::WriteFDEStateOnEntry(Writer* w) { // The first state, just after the control has been transferred to the the // function. @@ -1719,7 +1631,6 @@ void UnwindInfoSection::WriteFDEStateOnEntry(Writer* w) { desc_->GetStackStateStartAddress(CodeDescription::POST_RBP_PUSH)); } - void UnwindInfoSection::WriteFDEStateAfterRBPPush(Writer* w) { // The second state, just after RBP has been pushed. @@ -1740,7 +1651,6 @@ void UnwindInfoSection::WriteFDEStateAfterRBPPush(Writer* w) { desc_->GetStackStateStartAddress(CodeDescription::POST_RBP_SET)); } - void UnwindInfoSection::WriteFDEStateAfterRBPSet(Writer* w) { // The third state, after the RBP has been set. @@ -1755,7 +1665,6 @@ void UnwindInfoSection::WriteFDEStateAfterRBPSet(Writer* w) { desc_->GetStackStateStartAddress(CodeDescription::POST_RBP_POP)); } - void UnwindInfoSection::WriteFDEStateAfterRBPPop(Writer* w) { // The fourth (final) state. The RBP has been popped (just before issuing a // return). @@ -1775,80 +1684,69 @@ void UnwindInfoSection::WriteFDEStateAfterRBPPop(Writer* w) { w->Write(desc_->CodeEnd()); } - bool UnwindInfoSection::WriteBodyInternal(Writer* w) { uint32_t cie_position = WriteCIE(w); WriteFDE(w, cie_position); return true; } - #endif // V8_TARGET_ARCH_X64 -static void CreateDWARFSections(CodeDescription* desc, - Zone* zone, +static void CreateDWARFSections(CodeDescription* desc, Zone* zone, DebugObject* obj) { if (desc->IsLineInfoAvailable()) { - obj->AddSection(new(zone) DebugInfoSection(desc)); - obj->AddSection(new(zone) DebugAbbrevSection(desc)); - obj->AddSection(new(zone) DebugLineSection(desc)); + obj->AddSection(new (zone) DebugInfoSection(desc)); + obj->AddSection(new (zone) DebugAbbrevSection(desc)); + obj->AddSection(new (zone) DebugLineSection(desc)); } #if V8_TARGET_ARCH_X64 - obj->AddSection(new(zone) UnwindInfoSection(desc)); + obj->AddSection(new (zone) UnwindInfoSection(desc)); #endif } - // ------------------------------------------------------------------- // Binary GDB JIT Interface as described in // http://sourceware.org/gdb/onlinedocs/gdb/Declarations.html extern "C" { - typedef enum { - JIT_NOACTION = 0, - JIT_REGISTER_FN, - JIT_UNREGISTER_FN - } JITAction; +typedef enum { JIT_NOACTION = 0, JIT_REGISTER_FN, JIT_UNREGISTER_FN } JITAction; - struct JITCodeEntry { - JITCodeEntry* next_; - JITCodeEntry* prev_; - Address symfile_addr_; - uint64_t symfile_size_; - }; +struct JITCodeEntry { + JITCodeEntry* next_; + JITCodeEntry* prev_; + Address symfile_addr_; + uint64_t symfile_size_; +}; - struct JITDescriptor { - uint32_t version_; - uint32_t action_flag_; - JITCodeEntry* relevant_entry_; - JITCodeEntry* first_entry_; - }; +struct JITDescriptor { + uint32_t version_; + uint32_t action_flag_; + JITCodeEntry* relevant_entry_; + JITCodeEntry* first_entry_; +}; - // GDB will place breakpoint into this function. - // To prevent GCC from inlining or removing it we place noinline attribute - // and inline assembler statement inside. - void __attribute__((noinline)) __jit_debug_register_code() { - __asm__(""); - } +// GDB will place breakpoint into this function. +// To prevent GCC from inlining or removing it we place noinline attribute +// and inline assembler statement inside. +void __attribute__((noinline)) __jit_debug_register_code() { __asm__(""); } - // GDB will inspect contents of this descriptor. - // Static initialization is necessary to prevent GDB from seeing - // uninitialized descriptor. - JITDescriptor __jit_debug_descriptor = {1, 0, nullptr, nullptr}; +// GDB will inspect contents of this descriptor. +// Static initialization is necessary to prevent GDB from seeing +// uninitialized descriptor. +JITDescriptor __jit_debug_descriptor = {1, 0, nullptr, nullptr}; #ifdef OBJECT_PRINT - void __gdb_print_v8_object(Object object) { - StdoutStream os; - object->Print(os); - os << std::flush; - } +void __gdb_print_v8_object(Object object) { + StdoutStream os; + object->Print(os); + os << std::flush; +} #endif } - static JITCodeEntry* CreateCodeEntry(Address symfile_addr, uintptr_t symfile_size) { - JITCodeEntry* entry = static_cast( - malloc(sizeof(JITCodeEntry) + symfile_size)); + JITCodeEntry* entry = + static_cast(malloc(sizeof(JITCodeEntry) + symfile_size)); entry->symfile_addr_ = reinterpret_cast
(entry + 1); entry->symfile_size_ = symfile_size; @@ -1860,23 +1758,18 @@ static JITCodeEntry* CreateCodeEntry(Address symfile_addr, return entry; } - -static void DestroyCodeEntry(JITCodeEntry* entry) { - free(entry); -} - +static void DestroyCodeEntry(JITCodeEntry* entry) { free(entry); } static void RegisterCodeEntry(JITCodeEntry* entry) { entry->next_ = __jit_debug_descriptor.first_entry_; if (entry->next_ != nullptr) entry->next_->prev_ = entry; - __jit_debug_descriptor.first_entry_ = - __jit_debug_descriptor.relevant_entry_ = entry; + __jit_debug_descriptor.first_entry_ = __jit_debug_descriptor.relevant_entry_ = + entry; __jit_debug_descriptor.action_flag_ = JIT_REGISTER_FN; __jit_debug_register_code(); } - static void UnregisterCodeEntry(JITCodeEntry* entry) { if (entry->prev_ != nullptr) { entry->prev_->next_ = entry->next_; @@ -1893,16 +1786,14 @@ static void UnregisterCodeEntry(JITCodeEntry* entry) { __jit_debug_register_code(); } - static JITCodeEntry* CreateELFObject(CodeDescription* desc, Isolate* isolate) { #ifdef __MACH_O Zone zone(isolate->allocator(), ZONE_NAME); MachO mach_o(&zone); Writer w(&mach_o); - mach_o.AddSection(new(&zone) MachOTextSection(kCodeAlignment, - desc->CodeStart(), - desc->CodeSize())); + mach_o.AddSection(new (&zone) MachOTextSection( + kCodeAlignment, desc->CodeStart(), desc->CodeSize())); CreateDWARFSections(desc, &zone, &mach_o); @@ -1926,7 +1817,6 @@ static JITCodeEntry* CreateELFObject(CodeDescription* desc, Isolate* isolate) { return CreateCodeEntry(reinterpret_cast
(w.buffer()), w.position()); } - struct AddressRange { Address start; Address end; @@ -1954,7 +1844,6 @@ static CodeMap* GetCodeMap() { return code_map; } - static uint32_t HashCodeAddress(Address addr) { static const uintptr_t kGoldenRatio = 2654435761u; return static_cast((addr >> kCodeAlignmentBits) * kGoldenRatio); @@ -1968,7 +1857,6 @@ static base::HashMap* GetLineMap() { return line_map; } - static void PutLineInfo(Address addr, LineInfo* info) { base::HashMap* line_map = GetLineMap(); base::HashMap::Entry* e = line_map->LookupOrInsert( @@ -1977,14 +1865,12 @@ static void PutLineInfo(Address addr, LineInfo* info) { e->value = info; } - static LineInfo* GetLineInfo(Address addr) { void* value = GetLineMap()->Remove(reinterpret_cast(addr), HashCodeAddress(addr)); return static_cast(value); } - static void AddUnwindInfo(CodeDescription* desc) { #if V8_TARGET_ARCH_X64 if (desc->is_function()) { @@ -2021,10 +1907,8 @@ static void AddUnwindInfo(CodeDescription* desc) { #endif // V8_TARGET_ARCH_X64 } - static base::LazyMutex mutex = LAZY_MUTEX_INITIALIZER; - // Remove entries from the splay tree that intersect the given address range, // and deregister them from GDB. static void RemoveJITCodeEntries(CodeMap* map, const AddressRange& range) { @@ -2055,7 +1939,6 @@ static void RemoveJITCodeEntries(CodeMap* map, const AddressRange& range) { } } - // Insert the entry into the splay tree and register it with GDB. static void AddJITCodeEntry(CodeMap* map, const AddressRange& range, JITCodeEntry* entry, bool dump_if_enabled, @@ -2168,3 +2051,6 @@ void EventHandler(const v8::JitCodeEvent* event) { } // namespace GDBJITInterface } // namespace internal } // namespace v8 + +#undef __MACH_O +#undef __ELF diff --git a/src/gdb-jit.h b/src/diagnostics/gdb-jit.h similarity index 93% rename from src/gdb-jit.h rename to src/diagnostics/gdb-jit.h index 7ffc6459fb..e1bc852f0a 100644 --- a/src/gdb-jit.h +++ b/src/diagnostics/gdb-jit.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_GDB_JIT_H_ -#define V8_GDB_JIT_H_ +#ifndef V8_DIAGNOSTICS_GDB_JIT_H_ +#define V8_DIAGNOSTICS_GDB_JIT_H_ #include "include/v8.h" @@ -36,4 +36,4 @@ void EventHandler(const v8::JitCodeEvent* event); } // namespace internal } // namespace v8 -#endif // V8_GDB_JIT_H_ +#endif // V8_DIAGNOSTICS_GDB_JIT_H_ diff --git a/src/objects-debug.cc b/src/diagnostics/objects-debug.cc similarity index 99% rename from src/objects-debug.cc rename to src/diagnostics/objects-debug.cc index 5bb3bf27d5..e3dd30e0e8 100644 --- a/src/objects-debug.cc +++ b/src/diagnostics/objects-debug.cc @@ -5,14 +5,14 @@ #include "src/objects.h" #include "src/assembler-inl.h" -#include "src/counters.h" #include "src/date/date.h" -#include "src/disasm.h" -#include "src/disassembler.h" +#include "src/diagnostics/disasm.h" +#include "src/diagnostics/disassembler.h" #include "src/heap/combined-heap.h" #include "src/heap/heap-write-barrier-inl.h" #include "src/ic/handler-configuration-inl.h" #include "src/init/bootstrapper.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" #include "src/objects/allocation-site-inl.h" #include "src/objects/arguments-inl.h" @@ -1947,7 +1947,7 @@ void JSObject::IncrementSpillStatistics(Isolate* isolate, // Named properties if (HasFastProperties()) { info->number_of_objects_with_fast_properties_++; - info->number_of_fast_used_fields_ += map()->NextFreePropertyIndex(); + info->number_of_fast_used_fields_ += map()->NextFreePropertyIndex(); info->number_of_fast_unused_fields_ += map()->UnusedPropertyFields(); } else if (IsJSGlobalObject()) { GlobalDictionary dict = JSGlobalObject::cast(*this)->global_dictionary(); @@ -1980,7 +1980,7 @@ void JSObject::IncrementSpillStatistics(Isolate* isolate, for (int i = 0; i < len; i++) { if (e->get(i)->IsTheHole(isolate)) holes++; } - info->number_of_fast_used_elements_ += len - holes; + info->number_of_fast_used_elements_ += len - holes; info->number_of_fast_unused_elements_ += holes; break; } @@ -2010,7 +2010,6 @@ void JSObject::IncrementSpillStatistics(Isolate* isolate, } } - void JSObject::SpillInformation::Clear() { number_of_objects_ = 0; number_of_objects_with_fast_properties_ = 0; @@ -2025,21 +2024,20 @@ void JSObject::SpillInformation::Clear() { number_of_slow_unused_elements_ = 0; } - void JSObject::SpillInformation::Print() { PrintF("\n JSObject Spill Statistics (#%d):\n", number_of_objects_); PrintF(" - fast properties (#%d): %d (used) %d (unused)\n", - number_of_objects_with_fast_properties_, - number_of_fast_used_fields_, number_of_fast_unused_fields_); + number_of_objects_with_fast_properties_, number_of_fast_used_fields_, + number_of_fast_unused_fields_); PrintF(" - slow properties (#%d): %d (used) %d (unused)\n", number_of_objects_ - number_of_objects_with_fast_properties_, number_of_slow_used_properties_, number_of_slow_unused_properties_); PrintF(" - fast elements (#%d): %d (used) %d (unused)\n", - number_of_objects_with_fast_elements_, - number_of_fast_used_elements_, number_of_fast_unused_elements_); + number_of_objects_with_fast_elements_, number_of_fast_used_elements_, + number_of_fast_unused_elements_); PrintF(" - slow elements (#%d): %d (used) %d (unused)\n", number_of_objects_ - number_of_objects_with_fast_elements_, diff --git a/src/objects-printer.cc b/src/diagnostics/objects-printer.cc similarity index 99% rename from src/objects-printer.cc rename to src/diagnostics/objects-printer.cc index c50b449d13..50ad7371af 100644 --- a/src/objects-printer.cc +++ b/src/diagnostics/objects-printer.cc @@ -7,8 +7,8 @@ #include #include -#include "src/disasm.h" -#include "src/disassembler.h" +#include "src/diagnostics/disasm.h" +#include "src/diagnostics/disassembler.h" #include "src/heap/heap-inl.h" // For InOldSpace. #include "src/heap/heap-write-barrier-inl.h" // For GetIsolateFromWritableObj. #include "src/init/bootstrapper.h" @@ -472,12 +472,10 @@ void BytecodeArray::BytecodeArrayPrint(std::ostream& os) { // NOLINT Disassemble(os); } - void FreeSpace::FreeSpacePrint(std::ostream& os) { // NOLINT os << "free space, size " << Size() << "\n"; } - template void FixedTypedArray::FixedTypedArrayPrint( std::ostream& os) { // NOLINT @@ -877,7 +875,6 @@ void Symbol::SymbolPrint(std::ostream& os) { // NOLINT os << "\n - private: " << is_private(); } - void DescriptorArray::DescriptorArrayPrint(std::ostream& os) { PrintHeader(os, "DescriptorArray"); os << "\n - enum_cache: "; @@ -1209,7 +1206,6 @@ void JSMessageObject::JSMessageObjectPrint(std::ostream& os) { // NOLINT JSObjectPrintBody(os, *this); } - void String::StringPrint(std::ostream& os) { // NOLINT if (!IsOneByteRepresentation()) { os << "u"; @@ -1241,7 +1237,6 @@ void String::StringPrint(std::ostream& os) { // NOLINT if (!StringShape(*this).IsInternalized()) os << "\""; } - void Name::NamePrint(std::ostream& os) { // NOLINT if (IsString()) { String::cast(*this)->StringPrint(os); @@ -1250,10 +1245,8 @@ void Name::NamePrint(std::ostream& os) { // NOLINT } } - -static const char* const weekdays[] = { - "???", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" -}; +static const char* const weekdays[] = {"???", "Sun", "Mon", "Tue", + "Wed", "Thu", "Fri", "Sat"}; void JSDate::JSDatePrint(std::ostream& os) { // NOLINT JSObjectPrintHeader(os, *this, "JSDate"); @@ -1276,7 +1269,6 @@ void JSDate::JSDatePrint(std::ostream& os) { // NOLINT JSObjectPrintBody(os, *this); } - void JSProxy::JSProxyPrint(std::ostream& os) { // NOLINT PrintHeader(os, "JSProxy"); os << "\n - target: "; @@ -1643,7 +1635,6 @@ void Foreign::ForeignPrint(std::ostream& os) { // NOLINT os << "\n"; } - void AccessorInfo::AccessorInfoPrint(std::ostream& os) { // NOLINT PrintHeader(os, "AccessorInfo"); os << "\n - name: " << Brief(name()); @@ -1968,7 +1959,6 @@ void AccessorPair::AccessorPairPrint(std::ostream& os) { // NOLINT os << "\n"; } - void AccessCheckInfo::AccessCheckInfoPrint(std::ostream& os) { // NOLINT PrintHeader(os, "AccessCheckInfo"); os << "\n - callback: " << Brief(callback()); @@ -1999,7 +1989,6 @@ void InterceptorInfo::InterceptorInfoPrint(std::ostream& os) { // NOLINT os << "\n"; } - void FunctionTemplateInfo::FunctionTemplateInfoPrint( std::ostream& os) { // NOLINT PrintHeader(os, "FunctionTemplateInfo"); @@ -2056,7 +2045,6 @@ void ObjectTemplateInfo::ObjectTemplateInfoPrint(std::ostream& os) { // NOLINT os << "\n"; } - void AllocationSite::AllocationSitePrint(std::ostream& os) { // NOLINT PrintHeader(os, "AllocationSite"); if (this->HasWeakNext()) os << "\n - weak_next: " << Brief(weak_next()); @@ -2080,7 +2068,6 @@ void AllocationSite::AllocationSitePrint(std::ostream& os) { // NOLINT os << "\n"; } - void AllocationMemento::AllocationMementoPrint(std::ostream& os) { // NOLINT PrintHeader(os, "AllocationMemento"); os << "\n - allocation site: "; @@ -2091,7 +2078,6 @@ void AllocationMemento::AllocationMementoPrint(std::ostream& os) { // NOLINT } } - void Script::ScriptPrint(std::ostream& os) { // NOLINT PrintHeader(os, "Script"); os << "\n - source: " << Brief(source()); diff --git a/src/perf-jit.cc b/src/diagnostics/perf-jit.cc similarity index 98% rename from src/perf-jit.cc rename to src/diagnostics/perf-jit.cc index 318e2eb4a3..23432463b3 100644 --- a/src/perf-jit.cc +++ b/src/diagnostics/perf-jit.cc @@ -25,12 +25,12 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "src/perf-jit.h" +#include "src/diagnostics/perf-jit.h" #include #include "src/assembler.h" -#include "src/eh-frame.h" +#include "src/diagnostics/eh-frame.h" #include "src/objects-inl.h" #include "src/ostreams.h" #include "src/snapshot/embedded-data.h" @@ -40,7 +40,8 @@ #if V8_OS_LINUX #include #include -#undef MAP_TYPE // jumbo: conflicts with v8::internal::InstanceType::MAP_TYPE +// jumbo: conflicts with v8::internal::InstanceType::MAP_TYPE +#undef MAP_TYPE // NOLINT #include #endif // V8_OS_LINUX diff --git a/src/perf-jit.h b/src/diagnostics/perf-jit.h similarity index 97% rename from src/perf-jit.h rename to src/diagnostics/perf-jit.h index ac058c1660..492a550976 100644 --- a/src/perf-jit.h +++ b/src/diagnostics/perf-jit.h @@ -25,10 +25,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef V8_PERF_JIT_H_ -#define V8_PERF_JIT_H_ +#ifndef V8_DIAGNOSTICS_PERF_JIT_H_ +#define V8_DIAGNOSTICS_PERF_JIT_H_ -#include "src/log.h" +#include "src/logging/log.h" namespace v8 { namespace internal { @@ -144,4 +144,4 @@ class PerfJitLogger : public CodeEventLogger { } // namespace internal } // namespace v8 -#endif // V8_PERF_JIT_H_ +#endif // V8_DIAGNOSTICS_PERF_JIT_H_ diff --git a/src/unwinder.cc b/src/diagnostics/unwinder.cc similarity index 100% rename from src/unwinder.cc rename to src/diagnostics/unwinder.cc diff --git a/src/unwinding-info-win64.cc b/src/diagnostics/unwinding-info-win64.cc similarity index 99% rename from src/unwinding-info-win64.cc rename to src/diagnostics/unwinding-info-win64.cc index b98ccc28ac..5f506d7ced 100644 --- a/src/unwinding-info-win64.cc +++ b/src/diagnostics/unwinding-info-win64.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "src/unwinding-info-win64.h" +#include "src/diagnostics/unwinding-info-win64.h" #if defined(V8_OS_WIN_X64) diff --git a/src/unwinding-info-win64.h b/src/diagnostics/unwinding-info-win64.h similarity index 95% rename from src/unwinding-info-win64.h rename to src/diagnostics/unwinding-info-win64.h index af29c4673d..e619c71fe5 100644 --- a/src/unwinding-info-win64.h +++ b/src/diagnostics/unwinding-info-win64.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_UNWINDING_INFO_WIN64_H_ -#define V8_UNWINDING_INFO_WIN64_H_ +#ifndef V8_DIAGNOSTICS_UNWINDING_INFO_WIN64_H_ +#define V8_DIAGNOSTICS_UNWINDING_INFO_WIN64_H_ #include "include/v8.h" #include "include/v8config.h" @@ -98,4 +98,4 @@ class XdataEncoder { #endif // defined(V8_OS_WIN_X64) -#endif // V8_UNWINDING_INFO_WIN64_H_ +#endif // V8_DIAGNOSTICS_UNWINDING_INFO_WIN64_H_ diff --git a/src/extensions/statistics-extension.cc b/src/extensions/statistics-extension.cc index a13a4ce351..9a1670a0f5 100644 --- a/src/extensions/statistics-extension.cc +++ b/src/extensions/statistics-extension.cc @@ -4,9 +4,9 @@ #include "src/extensions/statistics-extension.h" -#include "src/counters.h" #include "src/heap/heap-inl.h" // crbug.com/v8/8499 #include "src/isolate.h" +#include "src/logging/counters.h" namespace v8 { namespace internal { diff --git a/src/external-reference-table.cc b/src/external-reference-table.cc index a54dce2ea5..66d5133a67 100644 --- a/src/external-reference-table.cc +++ b/src/external-reference-table.cc @@ -5,9 +5,9 @@ #include "src/external-reference-table.h" #include "src/accessors.h" -#include "src/counters.h" #include "src/external-reference.h" #include "src/ic/stub-cache.h" +#include "src/logging/counters.h" #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID) #define SYMBOLIZE_FUNCTION diff --git a/src/external-reference-table.h b/src/external-reference-table.h index 45d2f95c7e..235a892da3 100644 --- a/src/external-reference-table.h +++ b/src/external-reference-table.h @@ -9,8 +9,8 @@ #include "src/accessors.h" #include "src/builtins/builtins.h" -#include "src/counters-definitions.h" #include "src/external-reference.h" +#include "src/logging/counters-definitions.h" namespace v8 { namespace internal { diff --git a/src/external-reference.cc b/src/external-reference.cc index 1f02612fe2..b74c12d00b 100644 --- a/src/external-reference.cc +++ b/src/external-reference.cc @@ -7,13 +7,13 @@ #include "src/api/api.h" #include "src/base/ieee754.h" #include "src/compiler/code-assembler.h" -#include "src/counters.h" #include "src/cpu-features.h" #include "src/date/date.h" #include "src/debug/debug.h" #include "src/deoptimizer.h" #include "src/hash-seed-inl.h" #include "src/heap/heap.h" +#include "src/logging/counters.h" #include "src/objects/elements.h" #include "src/objects/ordered-hash-table.h" // For IncrementalMarking::RecordWriteFromCode. TODO(jkummerow): Drop. @@ -21,7 +21,7 @@ #include "src/ic/stub-cache.h" #include "src/interpreter/interpreter.h" #include "src/isolate.h" -#include "src/log.h" +#include "src/logging/log.h" #include "src/microtask-queue.h" #include "src/numbers/math-random.h" #include "src/objects-inl.h" diff --git a/src/flags.cc b/src/flags.cc index 36954b7aba..91a960a72e 100644 --- a/src/flags.cc +++ b/src/flags.cc @@ -13,8 +13,8 @@ #include "src/allocation.h" #include "src/base/functional.h" #include "src/base/platform/platform.h" -#include "src/counters.h" #include "src/cpu-features.h" +#include "src/logging/counters.h" #include "src/memcopy.h" #include "src/ostreams.h" #include "src/utils.h" diff --git a/src/heap/factory.cc b/src/heap/factory.cc index 9b52a7fe82..41006af9ba 100644 --- a/src/heap/factory.cc +++ b/src/heap/factory.cc @@ -11,7 +11,6 @@ #include "src/base/bits.h" #include "src/builtins/constants-table-builder.h" #include "src/compiler.h" -#include "src/counters.h" #include "src/hash-seed-inl.h" #include "src/heap/heap-inl.h" #include "src/heap/incremental-marking.h" @@ -21,7 +20,8 @@ #include "src/init/bootstrapper.h" #include "src/interpreter/interpreter.h" #include "src/isolate-inl.h" -#include "src/log.h" +#include "src/logging/counters.h" +#include "src/logging/log.h" #include "src/numbers/conversions.h" #include "src/objects/allocation-site-inl.h" #include "src/objects/api-callbacks.h" diff --git a/src/heap/gc-tracer.cc b/src/heap/gc-tracer.cc index 7d692bdab0..9ae24350f2 100644 --- a/src/heap/gc-tracer.cc +++ b/src/heap/gc-tracer.cc @@ -7,11 +7,11 @@ #include #include "src/base/atomic-utils.h" -#include "src/counters-inl.h" #include "src/heap/heap-inl.h" #include "src/heap/incremental-marking.h" #include "src/heap/spaces.h" #include "src/isolate.h" +#include "src/logging/counters-inl.h" namespace v8 { namespace internal { diff --git a/src/heap/gc-tracer.h b/src/heap/gc-tracer.h index b9604bdff0..54b5deaed4 100644 --- a/src/heap/gc-tracer.h +++ b/src/heap/gc-tracer.h @@ -8,10 +8,10 @@ #include "src/base/compiler-specific.h" #include "src/base/platform/platform.h" #include "src/base/ring-buffer.h" -#include "src/counters.h" #include "src/globals.h" #include "src/heap-symbols.h" #include "src/heap/heap.h" +#include "src/logging/counters.h" #include "testing/gtest/include/gtest/gtest_prod.h" // nogncheck namespace v8 { diff --git a/src/heap/heap.cc b/src/heap/heap.cc index e6ddfad926..c2e00bd00a 100644 --- a/src/heap/heap.cc +++ b/src/heap/heap.cc @@ -49,7 +49,7 @@ #include "src/heap/sweeper.h" #include "src/init/bootstrapper.h" #include "src/interpreter/interpreter.h" -#include "src/log.h" +#include "src/logging/log.h" #include "src/microtask-queue.h" #include "src/numbers/conversions.h" #include "src/objects/data-handler.h" diff --git a/src/heap/item-parallel-job.cc b/src/heap/item-parallel-job.cc index 17a9f04e79..7eb026ef9c 100644 --- a/src/heap/item-parallel-job.cc +++ b/src/heap/item-parallel-job.cc @@ -5,7 +5,7 @@ #include "src/heap/item-parallel-job.h" #include "src/base/platform/semaphore.h" -#include "src/counters.h" +#include "src/logging/counters.h" #include "src/v8.h" namespace v8 { diff --git a/src/heap/object-stats.cc b/src/heap/object-stats.cc index f8462def85..35e9e5b823 100644 --- a/src/heap/object-stats.cc +++ b/src/heap/object-stats.cc @@ -10,12 +10,12 @@ #include "src/assembler-inl.h" #include "src/base/bits.h" #include "src/compilation-cache.h" -#include "src/counters.h" #include "src/globals.h" #include "src/heap/combined-heap.h" #include "src/heap/heap-inl.h" #include "src/heap/mark-compact.h" #include "src/isolate.h" +#include "src/logging/counters.h" #include "src/memcopy.h" #include "src/objects/compilation-cache-inl.h" #include "src/objects/heap-object.h" diff --git a/src/heap/spaces.cc b/src/heap/spaces.cc index 8b70e31471..f31bf3d50f 100644 --- a/src/heap/spaces.cc +++ b/src/heap/spaces.cc @@ -11,7 +11,6 @@ #include "src/base/macros.h" #include "src/base/platform/semaphore.h" #include "src/base/template-utils.h" -#include "src/counters.h" #include "src/heap/array-buffer-tracker.h" #include "src/heap/combined-heap.h" #include "src/heap/concurrent-marking.h" @@ -23,6 +22,7 @@ #include "src/heap/remembered-set.h" #include "src/heap/slot-set.h" #include "src/heap/sweeper.h" +#include "src/logging/counters.h" #include "src/msan.h" #include "src/objects-inl.h" #include "src/objects/free-space-inl.h" diff --git a/src/heap/store-buffer.cc b/src/heap/store-buffer.cc index 86a8236276..b8c822d9c0 100644 --- a/src/heap/store-buffer.cc +++ b/src/heap/store-buffer.cc @@ -9,10 +9,10 @@ #include "src/base/bits.h" #include "src/base/macros.h" #include "src/base/template-utils.h" -#include "src/counters.h" #include "src/heap/incremental-marking.h" #include "src/heap/store-buffer-inl.h" #include "src/isolate.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" #include "src/v8.h" diff --git a/src/ia32/assembler-ia32.cc b/src/ia32/assembler-ia32.cc index c3c3a3f2c1..617f20cf82 100644 --- a/src/ia32/assembler-ia32.cc +++ b/src/ia32/assembler-ia32.cc @@ -51,7 +51,7 @@ #include "src/base/bits.h" #include "src/base/cpu.h" #include "src/deoptimizer.h" -#include "src/disassembler.h" +#include "src/diagnostics/disassembler.h" #include "src/macro-assembler.h" #include "src/numbers/conversions-inl.h" #include "src/string-constants.h" diff --git a/src/ia32/disasm-ia32.cc b/src/ia32/disasm-ia32.cc index 907118d638..89b493f10e 100644 --- a/src/ia32/disasm-ia32.cc +++ b/src/ia32/disasm-ia32.cc @@ -9,7 +9,7 @@ #if V8_TARGET_ARCH_IA32 #include "src/base/compiler-specific.h" -#include "src/disasm.h" +#include "src/diagnostics/disasm.h" #include "src/ia32/sse-instr.h" #include "src/utils.h" diff --git a/src/ia32/macro-assembler-ia32.cc b/src/ia32/macro-assembler-ia32.cc index 25178d75a2..6212f055cd 100644 --- a/src/ia32/macro-assembler-ia32.cc +++ b/src/ia32/macro-assembler-ia32.cc @@ -9,7 +9,6 @@ #include "src/base/utils/random-number-generator.h" #include "src/callable.h" #include "src/code-factory.h" -#include "src/counters.h" #include "src/debug/debug.h" #include "src/external-reference-table.h" #include "src/frame-constants.h" @@ -17,6 +16,7 @@ #include "src/heap/heap-inl.h" // For MemoryChunk. #include "src/ia32/assembler-ia32-inl.h" #include "src/init/bootstrapper.h" +#include "src/logging/counters.h" #include "src/macro-assembler.h" #include "src/runtime/runtime.h" #include "src/snapshot/embedded-data.h" diff --git a/src/ic/accessor-assembler.cc b/src/ic/accessor-assembler.cc index 962b6b7b32..e4a7a003bb 100644 --- a/src/ic/accessor-assembler.cc +++ b/src/ic/accessor-assembler.cc @@ -6,11 +6,11 @@ #include "src/ast/ast.h" #include "src/code-factory.h" -#include "src/counters.h" #include "src/ic/handler-configuration.h" #include "src/ic/ic.h" #include "src/ic/keyed-store-generic.h" #include "src/ic/stub-cache.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" #include "src/objects/cell.h" #include "src/objects/foreign.h" diff --git a/src/ic/ic-stats.cc b/src/ic/ic-stats.cc index 69c7150bd2..8f8fe818b0 100644 --- a/src/ic/ic-stats.cc +++ b/src/ic/ic-stats.cc @@ -4,7 +4,7 @@ #include "src/ic/ic-stats.h" -#include "src/counters.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" #include "src/tracing/trace-event.h" #include "src/tracing/traced-value.h" diff --git a/src/ic/stub-cache.cc b/src/ic/stub-cache.cc index 89a34ef80c..2a63835b8e 100644 --- a/src/ic/stub-cache.cc +++ b/src/ic/stub-cache.cc @@ -6,9 +6,9 @@ #include "src/ast/ast.h" #include "src/base/bits.h" -#include "src/counters.h" #include "src/heap/heap-inl.h" // For InYoungGeneration(). #include "src/ic/ic-inl.h" +#include "src/logging/counters.h" namespace v8 { namespace internal { diff --git a/src/init/bootstrapper.cc b/src/init/bootstrapper.cc index f431c8e9da..20ad3972a4 100644 --- a/src/init/bootstrapper.cc +++ b/src/init/bootstrapper.cc @@ -9,7 +9,6 @@ #include "src/api/api-natives.h" #include "src/base/ieee754.h" #include "src/compiler.h" -#include "src/counters.h" #include "src/debug/debug.h" #include "src/extensions/externalize-string-extension.h" #include "src/extensions/free-buffer-extension.h" @@ -20,6 +19,7 @@ #include "src/function-kind.h" #include "src/heap/heap-inl.h" #include "src/isolate-inl.h" +#include "src/logging/counters.h" #include "src/microtask-queue.h" #include "src/numbers/math-random.h" #include "src/objects/api-callbacks.h" diff --git a/src/interpreter/bytecode-array-writer.cc b/src/interpreter/bytecode-array-writer.cc index 2f324a0024..456759e65b 100644 --- a/src/interpreter/bytecode-array-writer.cc +++ b/src/interpreter/bytecode-array-writer.cc @@ -12,7 +12,7 @@ #include "src/interpreter/bytecode-source-info.h" #include "src/interpreter/constant-array-builder.h" #include "src/interpreter/handler-table-builder.h" -#include "src/log.h" +#include "src/logging/log.h" #include "src/objects-inl.h" namespace v8 { diff --git a/src/interpreter/interpreter.cc b/src/interpreter/interpreter.cc index b2a58c080a..2e1e0c55bf 100644 --- a/src/interpreter/interpreter.cc +++ b/src/interpreter/interpreter.cc @@ -10,11 +10,11 @@ #include "builtins-generated/bytecodes-builtins-list.h" #include "src/ast/prettyprinter.h" #include "src/compiler.h" -#include "src/counters-inl.h" #include "src/init/bootstrapper.h" #include "src/init/setup-isolate.h" #include "src/interpreter/bytecode-generator.h" #include "src/interpreter/bytecodes.h" +#include "src/logging/counters-inl.h" #include "src/objects-inl.h" #include "src/objects/shared-function-info.h" #include "src/objects/slots.h" diff --git a/src/isolate.cc b/src/isolate.cc index bc08a9e6b8..62a8498cd1 100644 --- a/src/isolate.cc +++ b/src/isolate.cc @@ -42,7 +42,7 @@ #include "src/interpreter/interpreter.h" #include "src/isolate-inl.h" #include "src/libsampler/sampler.h" -#include "src/log.h" +#include "src/logging/log.h" #include "src/messages.h" #include "src/microtask-queue.h" #include "src/objects/elements.h" @@ -85,7 +85,7 @@ #endif // V8_INTL_SUPPORT #if defined(V8_OS_WIN_X64) -#include "src/unwinding-info-win64.h" +#include "src/diagnostics/unwinding-info-win64.h" #endif extern "C" const uint8_t* v8_Default_embedded_blob_; diff --git a/src/logging/OWNERS b/src/logging/OWNERS new file mode 100644 index 0000000000..852d438bb0 --- /dev/null +++ b/src/logging/OWNERS @@ -0,0 +1 @@ +file://COMMON_OWNERS diff --git a/src/counters-definitions.h b/src/logging/counters-definitions.h similarity index 98% rename from src/counters-definitions.h rename to src/logging/counters-definitions.h index 1a61d142b9..bd3cb61812 100644 --- a/src/counters-definitions.h +++ b/src/logging/counters-definitions.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_COUNTERS_DEFINITIONS_H_ -#define V8_COUNTERS_DEFINITIONS_H_ +#ifndef V8_LOGGING_COUNTERS_DEFINITIONS_H_ +#define V8_LOGGING_COUNTERS_DEFINITIONS_H_ namespace v8 { namespace internal { @@ -238,42 +238,42 @@ namespace internal { // lines) rather than one macro (of length about 80 lines) to work around // this problem. Please avoid using recursive macros of this length when // possible. -#define STATS_COUNTER_LIST_1(SC) \ - /* Global Handle Count*/ \ - SC(global_handles, V8.GlobalHandles) \ - /* OS Memory allocated */ \ - SC(memory_allocated, V8.OsMemoryAllocated) \ - SC(maps_normalized, V8.MapsNormalized) \ - SC(maps_created, V8.MapsCreated) \ - SC(elements_transitions, V8.ObjectElementsTransitions) \ - SC(props_to_dictionary, V8.ObjectPropertiesToDictionary) \ - SC(elements_to_dictionary, V8.ObjectElementsToDictionary) \ - SC(alive_after_last_gc, V8.AliveAfterLastGC) \ - SC(objs_since_last_young, V8.ObjsSinceLastYoung) \ - SC(objs_since_last_full, V8.ObjsSinceLastFull) \ - SC(string_table_capacity, V8.StringTableCapacity) \ - SC(number_of_symbols, V8.NumberOfSymbols) \ - SC(inlined_copied_elements, V8.InlinedCopiedElements) \ - SC(compilation_cache_hits, V8.CompilationCacheHits) \ - SC(compilation_cache_misses, V8.CompilationCacheMisses) \ - /* Amount of evaled source code. */ \ - SC(total_eval_size, V8.TotalEvalSize) \ - /* Amount of loaded source code. */ \ - SC(total_load_size, V8.TotalLoadSize) \ - /* Amount of parsed source code. */ \ - SC(total_parse_size, V8.TotalParseSize) \ - /* Amount of source code skipped over using preparsing. */ \ - SC(total_preparse_skipped, V8.TotalPreparseSkipped) \ - /* Amount of compiled source code. */ \ - SC(total_compile_size, V8.TotalCompileSize) \ - /* Number of contexts created from scratch. */ \ - SC(contexts_created_from_scratch, V8.ContextsCreatedFromScratch) \ - /* Number of contexts created by partial snapshot. */ \ - SC(contexts_created_by_snapshot, V8.ContextsCreatedBySnapshot) \ - /* Number of code objects found from pc. */ \ - SC(pc_to_code, V8.PcToCode) \ - SC(pc_to_code_cached, V8.PcToCodeCached) \ - /* The store-buffer implementation of the write barrier. */ \ +#define STATS_COUNTER_LIST_1(SC) \ + /* Global Handle Count*/ \ + SC(global_handles, V8.GlobalHandles) \ + /* OS Memory allocated */ \ + SC(memory_allocated, V8.OsMemoryAllocated) \ + SC(maps_normalized, V8.MapsNormalized) \ + SC(maps_created, V8.MapsCreated) \ + SC(elements_transitions, V8.ObjectElementsTransitions) \ + SC(props_to_dictionary, V8.ObjectPropertiesToDictionary) \ + SC(elements_to_dictionary, V8.ObjectElementsToDictionary) \ + SC(alive_after_last_gc, V8.AliveAfterLastGC) \ + SC(objs_since_last_young, V8.ObjsSinceLastYoung) \ + SC(objs_since_last_full, V8.ObjsSinceLastFull) \ + SC(string_table_capacity, V8.StringTableCapacity) \ + SC(number_of_symbols, V8.NumberOfSymbols) \ + SC(inlined_copied_elements, V8.InlinedCopiedElements) \ + SC(compilation_cache_hits, V8.CompilationCacheHits) \ + SC(compilation_cache_misses, V8.CompilationCacheMisses) \ + /* Amount of evaled source code. */ \ + SC(total_eval_size, V8.TotalEvalSize) \ + /* Amount of loaded source code. */ \ + SC(total_load_size, V8.TotalLoadSize) \ + /* Amount of parsed source code. */ \ + SC(total_parse_size, V8.TotalParseSize) \ + /* Amount of source code skipped over using preparsing. */ \ + SC(total_preparse_skipped, V8.TotalPreparseSkipped) \ + /* Amount of compiled source code. */ \ + SC(total_compile_size, V8.TotalCompileSize) \ + /* Number of contexts created from scratch. */ \ + SC(contexts_created_from_scratch, V8.ContextsCreatedFromScratch) \ + /* Number of contexts created by partial snapshot. */ \ + SC(contexts_created_by_snapshot, V8.ContextsCreatedBySnapshot) \ + /* Number of code objects found from pc. */ \ + SC(pc_to_code, V8.PcToCode) \ + SC(pc_to_code_cached, V8.PcToCodeCached) \ + /* The store-buffer implementation of the write barrier. */ \ SC(store_buffer_overflows, V8.StoreBufferOverflows) #define STATS_COUNTER_LIST_2(SC) \ @@ -342,4 +342,4 @@ namespace internal { } // namespace internal } // namespace v8 -#endif // V8_COUNTERS_DEFINITIONS_H_ +#endif // V8_LOGGING_COUNTERS_DEFINITIONS_H_ diff --git a/src/counters-inl.h b/src/logging/counters-inl.h similarity index 92% rename from src/counters-inl.h rename to src/logging/counters-inl.h index ed16fcf0b7..11a9d92eb2 100644 --- a/src/counters-inl.h +++ b/src/logging/counters-inl.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_COUNTERS_INL_H_ -#define V8_COUNTERS_INL_H_ +#ifndef V8_LOGGING_COUNTERS_INL_H_ +#define V8_LOGGING_COUNTERS_INL_H_ -#include "src/counters.h" +#include "src/logging/counters.h" namespace v8 { namespace internal { @@ -65,4 +65,4 @@ RuntimeCallTimerScope::RuntimeCallTimerScope(Isolate* isolate, } // namespace internal } // namespace v8 -#endif // V8_COUNTERS_INL_H_ +#endif // V8_LOGGING_COUNTERS_INL_H_ diff --git a/src/counters.cc b/src/logging/counters.cc similarity index 98% rename from src/counters.cc rename to src/logging/counters.cc index 888e8dfe66..58f35e8bfa 100644 --- a/src/counters.cc +++ b/src/logging/counters.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "src/counters.h" +#include "src/logging/counters.h" #include #include "src/base/platform/platform.h" #include "src/builtins/builtins-definitions.h" -#include "src/counters-inl.h" #include "src/isolate.h" -#include "src/log-inl.h" -#include "src/log.h" +#include "src/logging/counters-inl.h" +#include "src/logging/log-inl.h" +#include "src/logging/log.h" #include "src/ostreams.h" namespace v8 { @@ -295,23 +295,23 @@ void Counters::ResetCreateHistogramFunction(CreateHistogramCallback f) { #undef HR #define HT(name, caption, max, res) name##_.Reset(); - HISTOGRAM_TIMER_LIST(HT) + HISTOGRAM_TIMER_LIST(HT) #undef HT #define HT(name, caption, max, res) name##_.Reset(); - TIMED_HISTOGRAM_LIST(HT) + TIMED_HISTOGRAM_LIST(HT) #undef HT #define AHT(name, caption) name##_.Reset(); - AGGREGATABLE_HISTOGRAM_TIMER_LIST(AHT) + AGGREGATABLE_HISTOGRAM_TIMER_LIST(AHT) #undef AHT #define HP(name, caption) name##_.Reset(); - HISTOGRAM_PERCENTAGE_LIST(HP) + HISTOGRAM_PERCENTAGE_LIST(HP) #undef HP #define HM(name, caption) name##_.Reset(); - HISTOGRAM_LEGACY_MEMORY_LIST(HM) + HISTOGRAM_LEGACY_MEMORY_LIST(HM) #undef HM } diff --git a/src/counters.h b/src/logging/counters.h similarity index 98% rename from src/counters.h rename to src/logging/counters.h index 3bcc8503a3..e7fa916808 100644 --- a/src/counters.h +++ b/src/logging/counters.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_COUNTERS_H_ -#define V8_COUNTERS_H_ +#ifndef V8_LOGGING_COUNTERS_H_ +#define V8_LOGGING_COUNTERS_H_ #include "include/v8.h" #include "src/allocation.h" @@ -11,10 +11,10 @@ #include "src/base/optional.h" #include "src/base/platform/elapsed-timer.h" #include "src/base/platform/time.h" -#include "src/counters-definitions.h" #include "src/globals.h" #include "src/heap-symbols.h" #include "src/isolate.h" +#include "src/logging/counters-definitions.h" #include "src/objects.h" #include "src/runtime/runtime.h" #include "src/tracing/trace-event.h" @@ -88,10 +88,7 @@ class StatsTable { // function. min and max define the expected minimum and maximum // sample values. buckets is the maximum number of buckets // that the samples will be grouped into. - void* CreateHistogram(const char* name, - int min, - int max, - size_t buckets) { + void* CreateHistogram(const char* name, int min, int max, size_t buckets) { if (!create_histogram_function_) return nullptr; return create_histogram_function_(name, min, max, buckets); } @@ -424,9 +421,7 @@ class HistogramTimer : public TimedHistogram { inline void Stop(); // Returns true if the timer is running. - bool Running() { - return Enabled() && timer_.IsStarted(); - } + bool Running() { return Enabled() && timer_.IsStarted(); } // TODO(bmeurer): Remove this when HistogramTimerScope is fixed. #ifdef DEBUG @@ -549,7 +544,6 @@ class AggregatedHistogramTimerScope { AggregatableHistogramTimer* histogram_; }; - // AggretatedMemoryHistogram collects (time, value) sample pairs and turns // them into time-uniform samples for the backing historgram, such that the // backing histogram receives one sample every T ms, where the T is controlled @@ -599,7 +593,6 @@ class AggregatedMemoryHistogram { Histogram* backing_histogram_; }; - template void AggregatedMemoryHistogram::AddSample(double current_ms, double current_value) { @@ -657,7 +650,6 @@ void AggregatedMemoryHistogram::AddSample(double current_ms, } } - template double AggregatedMemoryHistogram::Aggregate(double current_ms, double current_value) { @@ -1339,23 +1331,19 @@ class Counters : public std::enable_shared_from_this { TIMED_HISTOGRAM_LIST(HT) #undef HT -#define AHT(name, caption) \ - AggregatableHistogramTimer name##_; +#define AHT(name, caption) AggregatableHistogramTimer name##_; AGGREGATABLE_HISTOGRAM_TIMER_LIST(AHT) #undef AHT -#define HP(name, caption) \ - Histogram name##_; +#define HP(name, caption) Histogram name##_; HISTOGRAM_PERCENTAGE_LIST(HP) #undef HP -#define HM(name, caption) \ - Histogram name##_; +#define HM(name, caption) Histogram name##_; HISTOGRAM_LEGACY_MEMORY_LIST(HM) #undef HM -#define SC(name, caption) \ - StatsCounter name##_; +#define SC(name, caption) StatsCounter name##_; STATS_COUNTER_LIST_1(SC) STATS_COUNTER_LIST_2(SC) STATS_COUNTER_NATIVE_CODE_LIST(SC) @@ -1365,19 +1353,19 @@ class Counters : public std::enable_shared_from_this { STATS_COUNTER_TS_LIST(SC) #undef SC -#define SC(name) \ +#define SC(name) \ StatsCounter size_of_##name##_; \ StatsCounter count_of_##name##_; INSTANCE_TYPE_LIST(SC) #undef SC -#define SC(name) \ +#define SC(name) \ StatsCounter size_of_CODE_TYPE_##name##_; \ StatsCounter count_of_CODE_TYPE_##name##_; CODE_KIND_LIST(SC) #undef SC -#define SC(name) \ +#define SC(name) \ StatsCounter size_of_FIXED_ARRAY_##name##_; \ StatsCounter count_of_FIXED_ARRAY_##name##_; FIXED_ARRAY_SUB_INSTANCE_TYPE_LIST(SC) @@ -1407,4 +1395,4 @@ RuntimeCallTimerScope::RuntimeCallTimerScope(Isolate* isolate, } // namespace internal } // namespace v8 -#endif // V8_COUNTERS_H_ +#endif // V8_LOGGING_COUNTERS_H_ diff --git a/src/log-inl.h b/src/logging/log-inl.h similarity index 92% rename from src/log-inl.h rename to src/logging/log-inl.h index 92659c2a9c..e1f2b373d7 100644 --- a/src/log-inl.h +++ b/src/logging/log-inl.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_LOG_INL_H_ -#define V8_LOG_INL_H_ +#ifndef V8_LOGGING_LOG_INL_H_ +#define V8_LOGGING_LOG_INL_H_ -#include "src/log.h" #include "src/isolate.h" +#include "src/logging/log.h" #include "src/objects-inl.h" #include "src/tracing/trace-event.h" @@ -48,4 +48,4 @@ void TimerEventScope::LogTimerEvent(Logger::StartEnd se) { } // namespace internal } // namespace v8 -#endif // V8_LOG_INL_H_ +#endif // V8_LOGGING_LOG_INL_H_ diff --git a/src/log-utils.cc b/src/logging/log-utils.cc similarity index 99% rename from src/log-utils.cc rename to src/logging/log-utils.cc index b017b50a3f..c9007ab561 100644 --- a/src/log-utils.cc +++ b/src/logging/log-utils.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "src/log-utils.h" +#include "src/logging/log-utils.h" #include "src/assert-scope.h" #include "src/base/platform/platform.h" @@ -15,7 +15,6 @@ namespace v8 { namespace internal { - const char* const Log::kLogToTemporaryFile = "&"; const char* const Log::kLogToConsole = "-"; diff --git a/src/log-utils.h b/src/logging/log-utils.h similarity index 98% rename from src/log-utils.h rename to src/logging/log-utils.h index ab3cea653c..7aac995c85 100644 --- a/src/log-utils.h +++ b/src/logging/log-utils.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_LOG_UTILS_H_ -#define V8_LOG_UTILS_H_ +#ifndef V8_LOGGING_LOG_UTILS_H_ +#define V8_LOGGING_LOG_UTILS_H_ #include @@ -152,4 +152,4 @@ Log::MessageBuilder& Log::MessageBuilder::operator<<(Name name); } // namespace internal } // namespace v8 -#endif // V8_LOG_UTILS_H_ +#endif // V8_LOGGING_LOG_UTILS_H_ diff --git a/src/log.cc b/src/logging/log.cc similarity index 99% rename from src/log.cc rename to src/logging/log.cc index 221185eb56..14be528175 100644 --- a/src/log.cc +++ b/src/logging/log.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "src/log.h" +#include "src/logging/log.h" #include #include @@ -11,20 +11,20 @@ #include "src/api/api-inl.h" #include "src/bailout-reason.h" #include "src/base/platform/platform.h" -#include "src/counters.h" #include "src/deoptimizer.h" +#include "src/diagnostics/perf-jit.h" #include "src/global-handles.h" #include "src/init/bootstrapper.h" #include "src/interpreter/bytecodes.h" #include "src/interpreter/interpreter.h" #include "src/isolate.h" #include "src/libsampler/sampler.h" -#include "src/log-inl.h" -#include "src/log-utils.h" +#include "src/logging/counters.h" +#include "src/logging/log-inl.h" +#include "src/logging/log-utils.h" #include "src/macro-assembler.h" #include "src/memcopy.h" #include "src/objects/api-callbacks.h" -#include "src/perf-jit.h" #include "src/profiler/tick-sample.h" #include "src/runtime-profiler.h" #include "src/snapshot/embedded-data.h" @@ -98,9 +98,7 @@ class CodeEventLogger::NameBuffer { public: NameBuffer() { Reset(); } - void Reset() { - utf8_pos_ = 0; - } + void Reset() { utf8_pos_ = 0; } void Init(CodeEventListener::LogEventsAndTags tag) { Reset(); @@ -291,10 +289,8 @@ PerfBasicLogger::PerfBasicLogger(Isolate* isolate) // Open the perf JIT dump file. int bufferSize = sizeof(kFilenameFormatString) + kFilenameBufferPadding; ScopedVector perf_dump_name(bufferSize); - int size = SNPrintF( - perf_dump_name, - kFilenameFormatString, - base::OS::GetCurrentProcessId()); + int size = SNPrintF(perf_dump_name, kFilenameFormatString, + base::OS::GetCurrentProcessId()); CHECK_NE(size, -1); perf_output_handle_ = base::OS::FOpen(perf_dump_name.begin(), base::OS::LogFileOpenMode); @@ -302,7 +298,6 @@ PerfBasicLogger::PerfBasicLogger(Isolate* isolate) setvbuf(perf_output_handle_, nullptr, _IOLBF, 0); } - PerfBasicLogger::~PerfBasicLogger() { fclose(perf_output_handle_); perf_output_handle_ = nullptr; @@ -509,7 +504,6 @@ class LowLevelLogger : public CodeEventLogger { int32_t code_size; }; - struct CodeMoveStruct { static const char kTag = 'M'; @@ -517,10 +511,8 @@ class LowLevelLogger : public CodeEventLogger { Address to_address; }; - static const char kCodeMovingGCTag = 'G'; - // Extension added to V8 log file name to get the low-level log name. static const char kLogExt[]; @@ -553,13 +545,11 @@ LowLevelLogger::LowLevelLogger(Isolate* isolate, const char* name) LogCodeInfo(); } - LowLevelLogger::~LowLevelLogger() { fclose(ll_output_handle_); ll_output_handle_ = nullptr; } - void LowLevelLogger::LogCodeInfo() { #if V8_TARGET_ARCH_IA32 const char arch[] = "ia32"; @@ -618,7 +608,6 @@ void LowLevelLogger::LogWriteBytes(const char* bytes, int size) { USE(rv); } - void LowLevelLogger::CodeMovingGCEvent() { const char tag = kCodeMovingGCTag; @@ -703,9 +692,7 @@ void JitLogger::CodeMoveEvent(AbstractCode from, AbstractCode to) { } void JitLogger::AddCodeLinePosInfoEvent( - void* jit_handler_data, - int pc_offset, - int position, + void* jit_handler_data, int pc_offset, int position, JitCodeEvent::PositionType position_type) { JitCodeEvent event; memset(static_cast(&event), 0, sizeof(event)); @@ -719,7 +706,6 @@ void JitLogger::AddCodeLinePosInfoEvent( code_event_handler_(&event); } - void* JitLogger::StartCodePosInfoEvent() { JitCodeEvent event; memset(static_cast(&event), 0, sizeof(event)); @@ -742,7 +728,6 @@ void JitLogger::EndCodePosInfoEvent(Address start_address, code_event_handler_(&event); } - // TODO(lpy): Keeping sampling thread inside V8 is a workaround currently, // the reason is to reduce code duplication during migration to sampler library, // sampling thread, as well as the sampler, will be moved to D8 eventually. @@ -768,13 +753,12 @@ class SamplingThread : public base::Thread { const int interval_microseconds_; }; - // The Profiler samples pc and sp values for the main thread. // Each sample is appended to a circular buffer. // An independent thread removes data and writes it to the log. // This design minimizes the time spent in the sampler. // -class Profiler: public base::Thread { +class Profiler : public base::Thread { public: explicit Profiler(Isolate* isolate); void Engage(); @@ -813,8 +797,8 @@ class Profiler: public base::Thread { // between the signal handler and the worker thread. static const int kBufferSize = 128; v8::TickSample buffer_[kBufferSize]; // Buffer storage. - int head_; // Index to the buffer head. - base::Atomic32 tail_; // Index to the buffer tail. + int head_; // Index to the buffer head. + base::Atomic32 tail_; // Index to the buffer tail. bool overflow_; // Tell whether a buffer overflow has occurred. // Semaphore used for buffer synchronization. base::Semaphore buffer_semaphore_; @@ -823,12 +807,11 @@ class Profiler: public base::Thread { base::Atomic32 running_; }; - // // Ticker used to provide ticks to the profiler and the sliding state // window. // -class Ticker: public sampler::Sampler { +class Ticker : public sampler::Sampler { public: Ticker(Isolate* isolate, int interval_microseconds) : sampler::Sampler(reinterpret_cast(isolate)), @@ -897,7 +880,6 @@ void Profiler::Engage() { logger->ProfilerBeginEvent(); } - void Profiler::Disengage() { // Stop receiving ticks. isolate_->logger()->ticker_->ClearProfiler(); @@ -913,7 +895,6 @@ void Profiler::Disengage() { LOG(isolate_, UncheckedStringEvent("profiler", "end")); } - void Profiler::Run() { v8::TickSample sample; bool overflow = Remove(&sample); @@ -923,7 +904,6 @@ void Profiler::Run() { } } - // // Logger class implementation. // @@ -936,9 +916,7 @@ Logger::Logger(Isolate* isolate) is_initialized_(false), existing_code_logger_(isolate) {} -Logger::~Logger() { - delete log_; -} +Logger::~Logger() { delete log_; } const LogSeparator Logger::kNext = LogSeparator::kSeparator; @@ -958,12 +936,10 @@ void Logger::ProfilerBeginEvent() { msg.WriteToLogFile(); } - void Logger::StringEvent(const char* name, const char* value) { if (FLAG_log) UncheckedStringEvent(name, value); } - void Logger::UncheckedStringEvent(const char* name, const char* value) { if (!log_->IsEnabled()) return; Log::MessageBuilder msg(log_); @@ -971,12 +947,10 @@ void Logger::UncheckedStringEvent(const char* name, const char* value) { msg.WriteToLogFile(); } - void Logger::IntPtrTEvent(const char* name, intptr_t value) { if (FLAG_log) UncheckedIntPtrTEvent(name, value); } - void Logger::UncheckedIntPtrTEvent(const char* name, intptr_t value) { if (!log_->IsEnabled()) return; Log::MessageBuilder msg(log_); @@ -992,7 +966,6 @@ void Logger::HandleEvent(const char* name, Address* location) { msg.WriteToLogFile(); } - void Logger::ApiSecurityCheck() { if (!log_->IsEnabled() || !FLAG_log_api) return; Log::MessageBuilder msg(log_); @@ -1038,7 +1011,6 @@ void Logger::CodeDeoptEvent(Code code, DeoptimizeKind kind, Address pc, msg.WriteToLogFile(); } - void Logger::CurrentTimeEvent() { if (!log_->IsEnabled()) return; DCHECK(FLAG_log_internal_timer_events); @@ -1047,7 +1019,6 @@ void Logger::CurrentTimeEvent() { msg.WriteToLogFile(); } - void Logger::TimerEvent(Logger::StartEnd se, const char* name) { if (!log_->IsEnabled()) return; Log::MessageBuilder msg(log_); @@ -1111,7 +1082,6 @@ void Logger::ApiEntryCall(const char* name) { msg.WriteToLogFile(); } - void Logger::NewEvent(const char* name, void* object, size_t size) { if (!log_->IsEnabled() || !FLAG_log) return; Log::MessageBuilder msg(log_); @@ -1120,7 +1090,6 @@ void Logger::NewEvent(const char* name, void* object, size_t size) { msg.WriteToLogFile(); } - void Logger::DeleteEvent(const char* name, void* object) { if (!log_->IsEnabled() || !FLAG_log) return; Log::MessageBuilder msg(log_); @@ -1408,7 +1377,6 @@ void Logger::CodeNameEvent(Address addr, int pos, const char* code_name) { msg.WriteToLogFile(); } - void Logger::SharedFunctionInfoMoveEvent(Address from, Address to) { if (!is_listening_to_code_events()) return; MoveEventInternal(CodeEventListener::SHARED_FUNC_MOVE_EVENT, from, to); @@ -1423,7 +1391,6 @@ void Logger::MoveEventInternal(CodeEventListener::LogEventsAndTags event, msg.WriteToLogFile(); } - void Logger::ResourceEvent(const char* name, const char* tag) { if (!log_->IsEnabled() || !FLAG_log) return; Log::MessageBuilder msg(log_); @@ -1866,7 +1833,6 @@ static void PrepareLogFileName(std::ostream& os, // NOLINT } } - bool Logger::SetUp(Isolate* isolate) { // Tests and EnsureInitialize() can call this twice in a row. It's harmless. if (is_initialized_) return true; @@ -1913,7 +1879,6 @@ bool Logger::SetUp(Isolate* isolate) { return true; } - void Logger::SetCodeEventHandler(uint32_t options, JitCodeEventHandler event_handler) { if (jit_logger_) { diff --git a/src/log.h b/src/logging/log.h similarity index 98% rename from src/log.h rename to src/logging/log.h index 4aef388129..7d44a35d72 100644 --- a/src/log.h +++ b/src/logging/log.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef V8_LOG_H_ -#define V8_LOG_H_ +#ifndef V8_LOGGING_LOG_H_ +#define V8_LOGGING_LOG_H_ #include #include @@ -122,8 +122,7 @@ class Logger : public CodeEventListener { bool SetUp(Isolate* isolate); // Sets the current code event handler. - void SetCodeEventHandler(uint32_t options, - JitCodeEventHandler event_handler); + void SetCodeEventHandler(uint32_t options, JitCodeEventHandler event_handler); sampler::Sampler* sampler(); @@ -322,7 +321,8 @@ class Logger : public CodeEventListener { friend class Isolate; friend class TimeLog; friend class Profiler; - template friend class VMState; + template + friend class VMState; friend class LoggerTestHelper; bool is_logging_; @@ -365,7 +365,6 @@ class Logger : public CodeEventListener { TIMER_EVENTS_LIST(V) #undef V - template class TimerEventScope { public: @@ -477,5 +476,4 @@ class ExternalCodeEventListener : public CodeEventListener { } // namespace internal } // namespace v8 - -#endif // V8_LOG_H_ +#endif // V8_LOGGING_LOG_H_ diff --git a/src/messages.cc b/src/messages.cc index b19e7bf08e..b0826ef877 100644 --- a/src/messages.cc +++ b/src/messages.cc @@ -7,10 +7,10 @@ #include #include "src/api/api-inl.h" -#include "src/counters.h" #include "src/execution.h" #include "src/isolate-inl.h" #include "src/keys.h" +#include "src/logging/counters.h" #include "src/objects/foreign-inl.h" #include "src/objects/frame-array-inl.h" #include "src/objects/js-array-inl.h" diff --git a/src/mips/disasm-mips.cc b/src/mips/disasm-mips.cc index 0a762a1613..893219ce34 100644 --- a/src/mips/disasm-mips.cc +++ b/src/mips/disasm-mips.cc @@ -30,7 +30,7 @@ #if V8_TARGET_ARCH_MIPS #include "src/base/platform/platform.h" -#include "src/disasm.h" +#include "src/diagnostics/disasm.h" #include "src/macro-assembler.h" #include "src/mips/constants-mips.h" diff --git a/src/mips/macro-assembler-mips.cc b/src/mips/macro-assembler-mips.cc index 727bc3cd7b..d49edbba4b 100644 --- a/src/mips/macro-assembler-mips.cc +++ b/src/mips/macro-assembler-mips.cc @@ -11,12 +11,12 @@ #include "src/base/division-by-constant.h" #include "src/callable.h" #include "src/code-factory.h" -#include "src/counters.h" #include "src/debug/debug.h" #include "src/external-reference-table.h" #include "src/frames-inl.h" #include "src/heap/heap-inl.h" // For MemoryChunk. #include "src/init/bootstrapper.h" +#include "src/logging/counters.h" #include "src/macro-assembler.h" #include "src/objects/heap-number.h" #include "src/register-configuration.h" diff --git a/src/mips/simulator-mips.cc b/src/mips/simulator-mips.cc index 386051a250..f0ee1560d3 100644 --- a/src/mips/simulator-mips.cc +++ b/src/mips/simulator-mips.cc @@ -15,7 +15,7 @@ #include "src/assembler-inl.h" #include "src/base/bits.h" #include "src/base/lazy-instance.h" -#include "src/disasm.h" +#include "src/diagnostics/disasm.h" #include "src/heap/combined-heap.h" #include "src/macro-assembler.h" #include "src/mips/constants-mips.h" diff --git a/src/mips64/disasm-mips64.cc b/src/mips64/disasm-mips64.cc index 4b98a178fc..0a53c404a1 100644 --- a/src/mips64/disasm-mips64.cc +++ b/src/mips64/disasm-mips64.cc @@ -31,7 +31,7 @@ #if V8_TARGET_ARCH_MIPS64 #include "src/base/platform/platform.h" -#include "src/disasm.h" +#include "src/diagnostics/disasm.h" #include "src/macro-assembler.h" #include "src/mips64/constants-mips64.h" diff --git a/src/mips64/macro-assembler-mips64.cc b/src/mips64/macro-assembler-mips64.cc index d685f1e3c6..ab7518fb82 100644 --- a/src/mips64/macro-assembler-mips64.cc +++ b/src/mips64/macro-assembler-mips64.cc @@ -11,12 +11,12 @@ #include "src/base/division-by-constant.h" #include "src/callable.h" #include "src/code-factory.h" -#include "src/counters.h" #include "src/debug/debug.h" #include "src/external-reference-table.h" #include "src/frames-inl.h" #include "src/heap/heap-inl.h" // For MemoryChunk. #include "src/init/bootstrapper.h" +#include "src/logging/counters.h" #include "src/macro-assembler.h" #include "src/objects/heap-number.h" #include "src/register-configuration.h" diff --git a/src/mips64/simulator-mips64.cc b/src/mips64/simulator-mips64.cc index 0b9cf9d7fa..2a95aa4104 100644 --- a/src/mips64/simulator-mips64.cc +++ b/src/mips64/simulator-mips64.cc @@ -14,7 +14,7 @@ #include "src/assembler-inl.h" #include "src/base/bits.h" -#include "src/disasm.h" +#include "src/diagnostics/disasm.h" #include "src/heap/combined-heap.h" #include "src/macro-assembler.h" #include "src/mips64/constants-mips64.h" diff --git a/src/objects.cc b/src/objects.cc index af85144dc9..fdec955968 100644 --- a/src/objects.cc +++ b/src/objects.cc @@ -26,8 +26,6 @@ #include "src/base/utils/random-number-generator.h" #include "src/builtins/builtins.h" #include "src/compiler.h" -#include "src/counters-inl.h" -#include "src/counters.h" #include "src/date/date.h" #include "src/debug/debug.h" #include "src/execution.h" @@ -41,7 +39,9 @@ #include "src/init/bootstrapper.h" #include "src/isolate-inl.h" #include "src/keys.h" -#include "src/log.h" +#include "src/logging/counters-inl.h" +#include "src/logging/counters.h" +#include "src/logging/log.h" #include "src/message-template.h" #include "src/microtask-queue.h" #include "src/objects-body-descriptors-inl.h" diff --git a/src/objects/code.cc b/src/objects/code.cc index 24817ca65c..fa4b7b9aaa 100644 --- a/src/objects/code.cc +++ b/src/objects/code.cc @@ -21,9 +21,9 @@ #ifdef ENABLE_DISASSEMBLER #include "src/code-comments.h" -#include "src/disasm.h" -#include "src/disassembler.h" -#include "src/eh-frame.h" +#include "src/diagnostics/disasm.h" +#include "src/diagnostics/disassembler.h" +#include "src/diagnostics/eh-frame.h" #endif namespace v8 { diff --git a/src/objects/js-array-buffer.cc b/src/objects/js-array-buffer.cc index 8e843f8f03..22a5111ebb 100644 --- a/src/objects/js-array-buffer.cc +++ b/src/objects/js-array-buffer.cc @@ -5,7 +5,7 @@ #include "src/objects/js-array-buffer.h" #include "src/objects/js-array-buffer-inl.h" -#include "src/counters.h" +#include "src/logging/counters.h" #include "src/objects/property-descriptor.h" namespace v8 { diff --git a/src/objects/js-objects.cc b/src/objects/js-objects.cc index e1d1e24af3..c3f436c273 100644 --- a/src/objects/js-objects.cc +++ b/src/objects/js-objects.cc @@ -7,14 +7,14 @@ #include "src/api/api-arguments-inl.h" #include "src/arguments.h" #include "src/compiler.h" -#include "src/counters.h" #include "src/date/date.h" #include "src/handles-inl.h" #include "src/heap/heap-inl.h" #include "src/ic/ic.h" #include "src/init/bootstrapper.h" #include "src/isolate.h" -#include "src/log.h" +#include "src/logging/counters.h" +#include "src/logging/log.h" #include "src/maybe-handles.h" #include "src/objects-inl.h" #include "src/objects/allocation-site-inl.h" diff --git a/src/objects/lookup.cc b/src/objects/lookup.cc index 9eab27809e..8bd2cd38be 100644 --- a/src/objects/lookup.cc +++ b/src/objects/lookup.cc @@ -4,10 +4,10 @@ #include "src/objects/lookup.h" -#include "src/counters.h" #include "src/deoptimizer.h" #include "src/init/bootstrapper.h" #include "src/isolate-inl.h" +#include "src/logging/counters.h" #include "src/objects/elements.h" #include "src/objects/field-type.h" #include "src/objects/hash-table-inl.h" diff --git a/src/objects/map.cc b/src/objects/map.cc index e2f0507539..dc2c0bf253 100644 --- a/src/objects/map.cc +++ b/src/objects/map.cc @@ -4,13 +4,13 @@ #include "src/objects/map.h" -#include "src/counters-inl.h" #include "src/frames.h" #include "src/handles-inl.h" #include "src/heap/heap-write-barrier-inl.h" #include "src/init/bootstrapper.h" #include "src/isolate.h" -#include "src/log.h" +#include "src/logging/counters-inl.h" +#include "src/logging/log.h" #include "src/maybe-handles.h" #include "src/objects/descriptor-array.h" #include "src/objects/field-type.h" diff --git a/src/parsing/parse-info.cc b/src/parsing/parse-info.cc index 8a841e513e..868a6f2495 100644 --- a/src/parsing/parse-info.cc +++ b/src/parsing/parse-info.cc @@ -9,10 +9,10 @@ #include "src/ast/ast.h" #include "src/base/template-utils.h" #include "src/compiler-dispatcher/compiler-dispatcher.h" -#include "src/counters.h" #include "src/hash-seed-inl.h" #include "src/heap/heap-inl.h" -#include "src/log.h" +#include "src/logging/counters.h" +#include "src/logging/log.h" #include "src/objects-inl.h" #include "src/objects/scope-info.h" #include "src/zone/zone.h" diff --git a/src/parsing/parser-base.h b/src/parsing/parser-base.h index 9d4a53033c..10bdfdb8fb 100644 --- a/src/parsing/parser-base.h +++ b/src/parsing/parser-base.h @@ -15,10 +15,10 @@ #include "src/base/flags.h" #include "src/base/hashmap.h" #include "src/base/v8-fallthrough.h" -#include "src/counters.h" #include "src/function-kind.h" #include "src/globals.h" -#include "src/log.h" +#include "src/logging/counters.h" +#include "src/logging/log.h" #include "src/message-template.h" #include "src/parsing/expression-scope.h" #include "src/parsing/func-name-inferrer.h" diff --git a/src/parsing/parser.cc b/src/parsing/parser.cc index c145bbba8c..1827366d73 100644 --- a/src/parsing/parser.cc +++ b/src/parsing/parser.cc @@ -17,7 +17,7 @@ #include "src/base/platform/platform.h" #include "src/char-predicates-inl.h" #include "src/compiler-dispatcher/compiler-dispatcher.h" -#include "src/log.h" +#include "src/logging/log.h" #include "src/message-template.h" #include "src/numbers/conversions-inl.h" #include "src/objects/scope-info.h" diff --git a/src/parsing/scanner-character-streams.cc b/src/parsing/scanner-character-streams.cc index 096d861710..10aed33e49 100644 --- a/src/parsing/scanner-character-streams.cc +++ b/src/parsing/scanner-character-streams.cc @@ -8,9 +8,9 @@ #include #include "include/v8.h" -#include "src/counters.h" #include "src/globals.h" #include "src/handles.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" #include "src/parsing/scanner.h" #include "src/unicode-inl.h" diff --git a/src/ppc/disasm-ppc.cc b/src/ppc/disasm-ppc.cc index 71e9b35075..e041d1ef6b 100644 --- a/src/ppc/disasm-ppc.cc +++ b/src/ppc/disasm-ppc.cc @@ -31,7 +31,7 @@ #if V8_TARGET_ARCH_PPC #include "src/base/platform/platform.h" -#include "src/disasm.h" +#include "src/diagnostics/disasm.h" #include "src/macro-assembler.h" #include "src/ppc/constants-ppc.h" #include "src/register-configuration.h" diff --git a/src/ppc/macro-assembler-ppc.cc b/src/ppc/macro-assembler-ppc.cc index 25765c711f..eb8e94fb40 100644 --- a/src/ppc/macro-assembler-ppc.cc +++ b/src/ppc/macro-assembler-ppc.cc @@ -11,12 +11,12 @@ #include "src/base/division-by-constant.h" #include "src/callable.h" #include "src/code-factory.h" -#include "src/counters.h" #include "src/debug/debug.h" #include "src/external-reference-table.h" #include "src/frames-inl.h" #include "src/heap/heap-inl.h" // For MemoryChunk. #include "src/init/bootstrapper.h" +#include "src/logging/counters.h" #include "src/macro-assembler.h" #include "src/register-configuration.h" #include "src/runtime/runtime.h" diff --git a/src/ppc/simulator-ppc.cc b/src/ppc/simulator-ppc.cc index 35343eb06f..1a0506a797 100644 --- a/src/ppc/simulator-ppc.cc +++ b/src/ppc/simulator-ppc.cc @@ -13,7 +13,7 @@ #include "src/assembler.h" #include "src/base/bits.h" #include "src/base/lazy-instance.h" -#include "src/disasm.h" +#include "src/diagnostics/disasm.h" #include "src/heap/combined-heap.h" #include "src/macro-assembler.h" #include "src/objects-inl.h" diff --git a/src/profiler/cpu-profiler.cc b/src/profiler/cpu-profiler.cc index f8370e42fb..19f8608d86 100644 --- a/src/profiler/cpu-profiler.cc +++ b/src/profiler/cpu-profiler.cc @@ -12,7 +12,7 @@ #include "src/debug/debug.h" #include "src/frames-inl.h" #include "src/locked-queue-inl.h" -#include "src/log.h" +#include "src/logging/log.h" #include "src/profiler/cpu-profiler-inl.h" #include "src/vm-state-inl.h" #include "src/wasm/wasm-engine.h" diff --git a/src/profiler/tick-sample.cc b/src/profiler/tick-sample.cc index b27fa7be96..6b8f2dbc90 100644 --- a/src/profiler/tick-sample.cc +++ b/src/profiler/tick-sample.cc @@ -8,9 +8,9 @@ #include "include/v8-profiler.h" #include "src/asan.h" -#include "src/counters.h" #include "src/frames-inl.h" #include "src/heap/heap-inl.h" // For MemoryAllocator::code_range. +#include "src/logging/counters.h" #include "src/msan.h" #include "src/simulator.h" #include "src/vm-state-inl.h" diff --git a/src/regexp/arm/regexp-macro-assembler-arm.cc b/src/regexp/arm/regexp-macro-assembler-arm.cc index c20e0df40b..e881ddf4b5 100644 --- a/src/regexp/arm/regexp-macro-assembler-arm.cc +++ b/src/regexp/arm/regexp-macro-assembler-arm.cc @@ -8,7 +8,7 @@ #include "src/assembler-inl.h" #include "src/heap/factory.h" -#include "src/log.h" +#include "src/logging/log.h" #include "src/macro-assembler.h" #include "src/objects-inl.h" #include "src/regexp/regexp-macro-assembler.h" diff --git a/src/regexp/arm64/regexp-macro-assembler-arm64.cc b/src/regexp/arm64/regexp-macro-assembler-arm64.cc index ea439c44dd..b4539f12c0 100644 --- a/src/regexp/arm64/regexp-macro-assembler-arm64.cc +++ b/src/regexp/arm64/regexp-macro-assembler-arm64.cc @@ -7,7 +7,7 @@ #include "src/regexp/arm64/regexp-macro-assembler-arm64.h" #include "src/arm64/macro-assembler-arm64-inl.h" -#include "src/log.h" +#include "src/logging/log.h" #include "src/macro-assembler.h" #include "src/objects-inl.h" #include "src/regexp/regexp-macro-assembler.h" diff --git a/src/regexp/ia32/regexp-macro-assembler-ia32.cc b/src/regexp/ia32/regexp-macro-assembler-ia32.cc index bff703fcda..a39dca4b2d 100644 --- a/src/regexp/ia32/regexp-macro-assembler-ia32.cc +++ b/src/regexp/ia32/regexp-macro-assembler-ia32.cc @@ -7,7 +7,7 @@ #include "src/regexp/ia32/regexp-macro-assembler-ia32.h" #include "src/assembler-inl.h" -#include "src/log.h" +#include "src/logging/log.h" #include "src/macro-assembler.h" #include "src/objects-inl.h" #include "src/regexp/regexp-macro-assembler.h" diff --git a/src/regexp/mips/regexp-macro-assembler-mips.cc b/src/regexp/mips/regexp-macro-assembler-mips.cc index 524edc0734..3e1dfcfddd 100644 --- a/src/regexp/mips/regexp-macro-assembler-mips.cc +++ b/src/regexp/mips/regexp-macro-assembler-mips.cc @@ -7,7 +7,7 @@ #include "src/regexp/mips/regexp-macro-assembler-mips.h" #include "src/assembler-inl.h" -#include "src/log.h" +#include "src/logging/log.h" #include "src/macro-assembler.h" #include "src/objects-inl.h" #include "src/regexp/regexp-macro-assembler.h" diff --git a/src/regexp/mips64/regexp-macro-assembler-mips64.cc b/src/regexp/mips64/regexp-macro-assembler-mips64.cc index 0d8c9564e8..5b5bb8cc40 100644 --- a/src/regexp/mips64/regexp-macro-assembler-mips64.cc +++ b/src/regexp/mips64/regexp-macro-assembler-mips64.cc @@ -7,7 +7,7 @@ #include "src/regexp/mips64/regexp-macro-assembler-mips64.h" #include "src/assembler-inl.h" -#include "src/log.h" +#include "src/logging/log.h" #include "src/macro-assembler.h" #include "src/objects-inl.h" #include "src/regexp/regexp-macro-assembler.h" diff --git a/src/regexp/ppc/regexp-macro-assembler-ppc.cc b/src/regexp/ppc/regexp-macro-assembler-ppc.cc index c507fdaf9a..1306682e92 100644 --- a/src/regexp/ppc/regexp-macro-assembler-ppc.cc +++ b/src/regexp/ppc/regexp-macro-assembler-ppc.cc @@ -8,7 +8,7 @@ #include "src/assembler-inl.h" #include "src/base/bits.h" -#include "src/log.h" +#include "src/logging/log.h" #include "src/macro-assembler.h" #include "src/regexp/regexp-macro-assembler.h" #include "src/regexp/regexp-stack.h" diff --git a/src/regexp/s390/regexp-macro-assembler-s390.cc b/src/regexp/s390/regexp-macro-assembler-s390.cc index 99b7e34cf9..4c593123c8 100644 --- a/src/regexp/s390/regexp-macro-assembler-s390.cc +++ b/src/regexp/s390/regexp-macro-assembler-s390.cc @@ -8,12 +8,12 @@ #include "src/assembler-inl.h" #include "src/base/bits.h" -#include "src/log.h" +#include "src/logging/log.h" #include "src/macro-assembler.h" #include "src/regexp/regexp-macro-assembler.h" #include "src/regexp/regexp-stack.h" -#include "src/snapshot/embedded-data.h" #include "src/regexp/s390/regexp-macro-assembler-s390.h" +#include "src/snapshot/embedded-data.h" #include "src/unicode.h" namespace v8 { diff --git a/src/regexp/x64/regexp-macro-assembler-x64.cc b/src/regexp/x64/regexp-macro-assembler-x64.cc index 4be2d069bb..31136a0bf3 100644 --- a/src/regexp/x64/regexp-macro-assembler-x64.cc +++ b/src/regexp/x64/regexp-macro-assembler-x64.cc @@ -7,7 +7,7 @@ #include "src/regexp/x64/regexp-macro-assembler-x64.h" #include "src/heap/factory.h" -#include "src/log.h" +#include "src/logging/log.h" #include "src/macro-assembler.h" #include "src/objects-inl.h" #include "src/regexp/regexp-macro-assembler.h" diff --git a/src/runtime/runtime-array.cc b/src/runtime/runtime-array.cc index a037db46b2..a2c7cfc0b7 100644 --- a/src/runtime/runtime-array.cc +++ b/src/runtime/runtime-array.cc @@ -3,13 +3,13 @@ // found in the LICENSE file. #include "src/arguments-inl.h" -#include "src/counters.h" #include "src/debug/debug.h" #include "src/heap/factory.h" #include "src/heap/heap-inl.h" // For ToBoolean. TODO(jkummerow): Drop. #include "src/heap/heap-write-barrier-inl.h" #include "src/isolate-inl.h" #include "src/keys.h" +#include "src/logging/counters.h" #include "src/numbers/conversions-inl.h" #include "src/objects/allocation-site-inl.h" #include "src/objects/arguments-inl.h" diff --git a/src/runtime/runtime-atomics.cc b/src/runtime/runtime-atomics.cc index afc24fa1db..e98026373e 100644 --- a/src/runtime/runtime-atomics.cc +++ b/src/runtime/runtime-atomics.cc @@ -5,8 +5,8 @@ #include "src/arguments-inl.h" #include "src/base/macros.h" #include "src/base/platform/mutex.h" -#include "src/counters.h" #include "src/heap/factory.h" +#include "src/logging/counters.h" #include "src/numbers/conversions-inl.h" #include "src/objects/js-array-buffer-inl.h" #include "src/runtime/runtime-utils.h" diff --git a/src/runtime/runtime-bigint.cc b/src/runtime/runtime-bigint.cc index f718ab7eb4..1927bf41d8 100644 --- a/src/runtime/runtime-bigint.cc +++ b/src/runtime/runtime-bigint.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "src/arguments-inl.h" -#include "src/counters.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" #include "src/objects/bigint.h" #include "src/runtime/runtime-utils.h" diff --git a/src/runtime/runtime-classes.cc b/src/runtime/runtime-classes.cc index a9104be790..cf203b785e 100644 --- a/src/runtime/runtime-classes.cc +++ b/src/runtime/runtime-classes.cc @@ -9,10 +9,10 @@ #include "src/accessors.h" #include "src/arguments-inl.h" -#include "src/counters.h" #include "src/debug/debug.h" #include "src/isolate-inl.h" -#include "src/log.h" +#include "src/logging/counters.h" +#include "src/logging/log.h" #include "src/message-template.h" #include "src/objects/elements.h" #include "src/objects/hash-table-inl.h" diff --git a/src/runtime/runtime-collections.cc b/src/runtime/runtime-collections.cc index 32dca13a75..d67d660bbc 100644 --- a/src/runtime/runtime-collections.cc +++ b/src/runtime/runtime-collections.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #include "src/arguments-inl.h" -#include "src/counters.h" #include "src/heap/factory.h" #include "src/heap/heap-inl.h" // For ToBoolean. TODO(jkummerow): Drop. +#include "src/logging/counters.h" #include "src/numbers/conversions-inl.h" #include "src/objects/hash-table-inl.h" #include "src/objects/js-collection-inl.h" diff --git a/src/runtime/runtime-date.cc b/src/runtime/runtime-date.cc index 496851adb6..9b0e384e4f 100644 --- a/src/runtime/runtime-date.cc +++ b/src/runtime/runtime-date.cc @@ -5,10 +5,10 @@ #include "src/runtime/runtime-utils.h" #include "src/arguments.h" -#include "src/counters.h" #include "src/date/date.h" #include "src/heap/factory.h" #include "src/isolate-inl.h" +#include "src/logging/counters.h" #include "src/numbers/conversions-inl.h" namespace v8 { diff --git a/src/runtime/runtime-debug.cc b/src/runtime/runtime-debug.cc index 1bc0b9df70..5d19037d06 100644 --- a/src/runtime/runtime-debug.cc +++ b/src/runtime/runtime-debug.cc @@ -6,7 +6,6 @@ #include "src/arguments-inl.h" #include "src/compiler.h" -#include "src/counters.h" #include "src/debug/debug-coverage.h" #include "src/debug/debug-evaluate.h" #include "src/debug/debug-frames.h" @@ -20,6 +19,7 @@ #include "src/interpreter/bytecodes.h" #include "src/interpreter/interpreter.h" #include "src/isolate-inl.h" +#include "src/logging/counters.h" #include "src/objects/debug-objects-inl.h" #include "src/objects/heap-object-inl.h" #include "src/objects/js-collection-inl.h" diff --git a/src/runtime/runtime-forin.cc b/src/runtime/runtime-forin.cc index 9bb370e211..e377cfd2df 100644 --- a/src/runtime/runtime-forin.cc +++ b/src/runtime/runtime-forin.cc @@ -5,11 +5,11 @@ #include "src/runtime/runtime-utils.h" #include "src/arguments-inl.h" -#include "src/counters.h" #include "src/heap/factory.h" #include "src/heap/heap-inl.h" // For ToBoolean. TODO(jkummerow): Drop. #include "src/isolate-inl.h" #include "src/keys.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" #include "src/objects/elements.h" #include "src/objects/module.h" diff --git a/src/runtime/runtime-function.cc b/src/runtime/runtime-function.cc index d71fe9a8ff..2ad2f0d0bc 100644 --- a/src/runtime/runtime-function.cc +++ b/src/runtime/runtime-function.cc @@ -5,9 +5,9 @@ #include "src/accessors.h" #include "src/arguments-inl.h" #include "src/compiler.h" -#include "src/counters.h" #include "src/heap/heap-inl.h" // For ToBoolean. TODO(jkummerow): Drop. #include "src/isolate-inl.h" +#include "src/logging/counters.h" #include "src/runtime/runtime-utils.h" namespace v8 { diff --git a/src/runtime/runtime-futex.cc b/src/runtime/runtime-futex.cc index 6b8fc25ebe..dbfc965c9b 100644 --- a/src/runtime/runtime-futex.cc +++ b/src/runtime/runtime-futex.cc @@ -6,9 +6,9 @@ #include "src/arguments-inl.h" #include "src/base/platform/time.h" -#include "src/counters.h" #include "src/futex-emulation.h" #include "src/globals.h" +#include "src/logging/counters.h" #include "src/numbers/conversions-inl.h" #include "src/objects/heap-object-inl.h" #include "src/objects/js-array-buffer-inl.h" diff --git a/src/runtime/runtime-generator.cc b/src/runtime/runtime-generator.cc index f8873ff938..19839a1369 100644 --- a/src/runtime/runtime-generator.cc +++ b/src/runtime/runtime-generator.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #include "src/arguments-inl.h" -#include "src/counters.h" #include "src/heap/factory.h" #include "src/heap/heap-inl.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" #include "src/objects/js-generator-inl.h" #include "src/runtime/runtime-utils.h" diff --git a/src/runtime/runtime-internal.cc b/src/runtime/runtime-internal.cc index cd501a58d3..8fee2233fb 100644 --- a/src/runtime/runtime-internal.cc +++ b/src/runtime/runtime-internal.cc @@ -9,12 +9,12 @@ #include "src/ast/ast-traversal-visitor.h" #include "src/ast/prettyprinter.h" #include "src/builtins/builtins.h" -#include "src/counters.h" #include "src/debug/debug.h" #include "src/feedback-vector-inl.h" #include "src/frames-inl.h" #include "src/init/bootstrapper.h" #include "src/isolate-inl.h" +#include "src/logging/counters.h" #include "src/message-template.h" #include "src/numbers/conversions.h" #include "src/objects/js-array-inl.h" diff --git a/src/runtime/runtime-interpreter.cc b/src/runtime/runtime-interpreter.cc index ad84317415..b4f21fa086 100644 --- a/src/runtime/runtime-interpreter.cc +++ b/src/runtime/runtime-interpreter.cc @@ -5,7 +5,6 @@ #include #include "src/arguments-inl.h" -#include "src/counters.h" #include "src/frames-inl.h" #include "src/interpreter/bytecode-array-iterator.h" #include "src/interpreter/bytecode-decoder.h" @@ -14,6 +13,7 @@ #include "src/interpreter/bytecodes.h" #include "src/interpreter/interpreter.h" #include "src/isolate-inl.h" +#include "src/logging/counters.h" #include "src/ostreams.h" #include "src/runtime/runtime-utils.h" #include "src/snapshot/snapshot.h" diff --git a/src/runtime/runtime-intl.cc b/src/runtime/runtime-intl.cc index 62db61666e..c9cefe2eff 100644 --- a/src/runtime/runtime-intl.cc +++ b/src/runtime/runtime-intl.cc @@ -12,11 +12,11 @@ #include "src/api/api-inl.h" #include "src/api/api-natives.h" #include "src/arguments-inl.h" -#include "src/counters.h" #include "src/date/date.h" #include "src/global-handles.h" #include "src/heap/factory.h" #include "src/isolate-inl.h" +#include "src/logging/counters.h" #include "src/objects/intl-objects.h" #include "src/objects/js-array-inl.h" #include "src/objects/js-collator-inl.h" diff --git a/src/runtime/runtime-literals.cc b/src/runtime/runtime-literals.cc index 6200a94533..ce63f87b4c 100644 --- a/src/runtime/runtime-literals.cc +++ b/src/runtime/runtime-literals.cc @@ -5,8 +5,8 @@ #include "src/allocation-site-scopes-inl.h" #include "src/arguments-inl.h" #include "src/ast/ast.h" -#include "src/counters.h" #include "src/isolate-inl.h" +#include "src/logging/counters.h" #include "src/objects/hash-table-inl.h" #include "src/objects/heap-number-inl.h" #include "src/objects/heap-object-inl.h" diff --git a/src/runtime/runtime-module.cc b/src/runtime/runtime-module.cc index 91dac4fa1c..34a398e193 100644 --- a/src/runtime/runtime-module.cc +++ b/src/runtime/runtime-module.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "src/arguments-inl.h" -#include "src/counters.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" #include "src/objects/js-promise.h" #include "src/objects/module.h" diff --git a/src/runtime/runtime-numbers.cc b/src/runtime/runtime-numbers.cc index 41d522d6e9..4f3a0cf55d 100644 --- a/src/runtime/runtime-numbers.cc +++ b/src/runtime/runtime-numbers.cc @@ -4,10 +4,10 @@ #include "src/arguments-inl.h" #include "src/base/bits.h" -#include "src/counters.h" #include "src/heap/heap-inl.h" // For ToBoolean. TODO(jkummerow): Drop. #include "src/init/bootstrapper.h" #include "src/isolate-inl.h" +#include "src/logging/counters.h" #include "src/runtime/runtime-utils.h" namespace v8 { diff --git a/src/runtime/runtime-object.cc b/src/runtime/runtime-object.cc index ceebfd7cec..a6b39d052d 100644 --- a/src/runtime/runtime-object.cc +++ b/src/runtime/runtime-object.cc @@ -3,11 +3,11 @@ // found in the LICENSE file. #include "src/arguments-inl.h" -#include "src/counters.h" #include "src/debug/debug.h" #include "src/heap/heap-inl.h" // For ToBoolean. TODO(jkummerow): Drop. #include "src/init/bootstrapper.h" #include "src/isolate-inl.h" +#include "src/logging/counters.h" #include "src/message-template.h" #include "src/objects/hash-table-inl.h" #include "src/objects/js-array-inl.h" diff --git a/src/runtime/runtime-operators.cc b/src/runtime/runtime-operators.cc index cc932f2b41..6d1d854211 100644 --- a/src/runtime/runtime-operators.cc +++ b/src/runtime/runtime-operators.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #include "src/arguments.h" -#include "src/counters.h" #include "src/heap/heap-inl.h" // For ToBoolean. TODO(jkummerow): Drop. #include "src/isolate-inl.h" +#include "src/logging/counters.h" #include "src/runtime/runtime-utils.h" namespace v8 { diff --git a/src/runtime/runtime-promise.cc b/src/runtime/runtime-promise.cc index dee6ccb4e4..fe4585a4f7 100644 --- a/src/runtime/runtime-promise.cc +++ b/src/runtime/runtime-promise.cc @@ -4,8 +4,8 @@ #include "src/api/api-inl.h" #include "src/arguments-inl.h" -#include "src/counters.h" #include "src/debug/debug.h" +#include "src/logging/counters.h" #include "src/microtask-queue.h" #include "src/objects-inl.h" #include "src/objects/elements.h" diff --git a/src/runtime/runtime-proxy.cc b/src/runtime/runtime-proxy.cc index ee1adc1510..135eca7550 100644 --- a/src/runtime/runtime-proxy.cc +++ b/src/runtime/runtime-proxy.cc @@ -5,10 +5,10 @@ #include "src/runtime/runtime-utils.h" #include "src/arguments-inl.h" -#include "src/counters.h" #include "src/heap/factory.h" #include "src/heap/heap-inl.h" // For ToBoolean. TODO(jkummerow): Drop. #include "src/isolate-inl.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" #include "src/objects/elements.h" diff --git a/src/runtime/runtime-regexp.cc b/src/runtime/runtime-regexp.cc index 79bffc2a3f..30477373eb 100644 --- a/src/runtime/runtime-regexp.cc +++ b/src/runtime/runtime-regexp.cc @@ -5,9 +5,9 @@ #include #include "src/arguments-inl.h" -#include "src/counters.h" #include "src/heap/heap-inl.h" // For ToBoolean. TODO(jkummerow): Drop. #include "src/isolate-inl.h" +#include "src/logging/counters.h" #include "src/message-template.h" #include "src/numbers/conversions-inl.h" #include "src/objects/js-array-inl.h" diff --git a/src/runtime/runtime-scopes.cc b/src/runtime/runtime-scopes.cc index 9b45f570a1..eb4111e951 100644 --- a/src/runtime/runtime-scopes.cc +++ b/src/runtime/runtime-scopes.cc @@ -7,12 +7,12 @@ #include "src/accessors.h" #include "src/arguments-inl.h" #include "src/ast/scopes.h" -#include "src/counters.h" #include "src/deoptimizer.h" #include "src/frames-inl.h" #include "src/heap/heap-inl.h" // For ToBoolean. TODO(jkummerow): Drop. #include "src/init/bootstrapper.h" #include "src/isolate-inl.h" +#include "src/logging/counters.h" #include "src/message-template.h" #include "src/objects/heap-object-inl.h" #include "src/objects/module-inl.h" diff --git a/src/runtime/runtime-strings.cc b/src/runtime/runtime-strings.cc index 95606da4a7..ff9fa24e25 100644 --- a/src/runtime/runtime-strings.cc +++ b/src/runtime/runtime-strings.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "src/arguments-inl.h" -#include "src/counters.h" #include "src/heap/heap-inl.h" +#include "src/logging/counters.h" #include "src/numbers/conversions.h" #include "src/objects-inl.h" #include "src/objects/js-array-inl.h" diff --git a/src/runtime/runtime-symbol.cc b/src/runtime/runtime-symbol.cc index b47794938a..0e5d476417 100644 --- a/src/runtime/runtime-symbol.cc +++ b/src/runtime/runtime-symbol.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #include "src/arguments-inl.h" -#include "src/counters.h" #include "src/heap/heap-inl.h" // For ToBoolean. TODO(jkummerow): Drop. #include "src/isolate-inl.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" #include "src/runtime/runtime-utils.h" #include "src/string-builder-inl.h" diff --git a/src/runtime/runtime-test.cc b/src/runtime/runtime-test.cc index 3f29c41b33..0e2a376422 100644 --- a/src/runtime/runtime-test.cc +++ b/src/runtime/runtime-test.cc @@ -13,13 +13,13 @@ #include "src/base/platform/mutex.h" #include "src/compiler-dispatcher/optimizing-compile-dispatcher.h" #include "src/compiler.h" -#include "src/counters.h" #include "src/deoptimizer.h" #include "src/frames-inl.h" #include "src/heap/heap-inl.h" // For ToBoolean. TODO(jkummerow): Drop. #include "src/heap/heap-write-barrier-inl.h" #include "src/ic/stub-cache.h" #include "src/isolate-inl.h" +#include "src/logging/counters.h" #include "src/objects/heap-object-inl.h" #include "src/objects/smi.h" #include "src/ostreams.h" diff --git a/src/runtime/runtime-typedarray.cc b/src/runtime/runtime-typedarray.cc index 9fe331feeb..fdc300a6ec 100644 --- a/src/runtime/runtime-typedarray.cc +++ b/src/runtime/runtime-typedarray.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #include "src/arguments-inl.h" -#include "src/counters.h" #include "src/heap/factory.h" #include "src/heap/heap-inl.h" +#include "src/logging/counters.h" #include "src/message-template.h" #include "src/objects-inl.h" #include "src/objects/elements.h" diff --git a/src/runtime/runtime-wasm.cc b/src/runtime/runtime-wasm.cc index dd6a28f70e..74cb595c2f 100644 --- a/src/runtime/runtime-wasm.cc +++ b/src/runtime/runtime-wasm.cc @@ -4,10 +4,10 @@ #include "src/arguments-inl.h" #include "src/compiler/wasm-compiler.h" -#include "src/counters.h" #include "src/debug/debug.h" #include "src/frame-constants.h" #include "src/heap/factory.h" +#include "src/logging/counters.h" #include "src/message-template.h" #include "src/numbers/conversions.h" #include "src/objects-inl.h" diff --git a/src/runtime/runtime-weak-refs.cc b/src/runtime/runtime-weak-refs.cc index d80c0e2da6..9685fc3bb3 100644 --- a/src/runtime/runtime-weak-refs.cc +++ b/src/runtime/runtime-weak-refs.cc @@ -5,9 +5,9 @@ #include "include/v8.h" #include "src/api/api.h" #include "src/arguments-inl.h" -#include "src/counters.h" #include "src/execution.h" #include "src/handles-inl.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" #include "src/objects/js-weak-refs-inl.h" #include "src/runtime/runtime-utils.h" diff --git a/src/s390/disasm-s390.cc b/src/s390/disasm-s390.cc index 63163189c0..39f693a3f7 100644 --- a/src/s390/disasm-s390.cc +++ b/src/s390/disasm-s390.cc @@ -30,7 +30,7 @@ #if V8_TARGET_ARCH_S390 #include "src/base/platform/platform.h" -#include "src/disasm.h" +#include "src/diagnostics/disasm.h" #include "src/macro-assembler.h" #include "src/register-configuration.h" #include "src/s390/constants-s390.h" diff --git a/src/s390/macro-assembler-s390.cc b/src/s390/macro-assembler-s390.cc index e4ce1c5a28..8122b622fb 100644 --- a/src/s390/macro-assembler-s390.cc +++ b/src/s390/macro-assembler-s390.cc @@ -11,12 +11,12 @@ #include "src/base/division-by-constant.h" #include "src/callable.h" #include "src/code-factory.h" -#include "src/counters.h" #include "src/debug/debug.h" #include "src/external-reference-table.h" #include "src/frames-inl.h" #include "src/heap/heap-inl.h" // For MemoryChunk. #include "src/init/bootstrapper.h" +#include "src/logging/counters.h" #include "src/macro-assembler.h" #include "src/objects/smi.h" #include "src/register-configuration.h" diff --git a/src/s390/simulator-s390.cc b/src/s390/simulator-s390.cc index bfc685fc7f..7cf881b370 100644 --- a/src/s390/simulator-s390.cc +++ b/src/s390/simulator-s390.cc @@ -14,7 +14,7 @@ #include "src/assembler.h" #include "src/base/bits.h" #include "src/base/once.h" -#include "src/disasm.h" +#include "src/diagnostics/disasm.h" #include "src/heap/combined-heap.h" #include "src/macro-assembler.h" #include "src/objects-inl.h" diff --git a/src/safepoint-table.cc b/src/safepoint-table.cc index f3fc966b20..fccc3765db 100644 --- a/src/safepoint-table.cc +++ b/src/safepoint-table.cc @@ -6,7 +6,7 @@ #include "src/assembler-inl.h" #include "src/deoptimizer.h" -#include "src/disasm.h" +#include "src/diagnostics/disasm.h" #include "src/frames-inl.h" #include "src/macro-assembler.h" #include "src/ostreams.h" diff --git a/src/snapshot/code-serializer.cc b/src/snapshot/code-serializer.cc index 946b5f4bde..41eaa0a959 100644 --- a/src/snapshot/code-serializer.cc +++ b/src/snapshot/code-serializer.cc @@ -4,10 +4,10 @@ #include "src/snapshot/code-serializer.h" -#include "src/counters.h" #include "src/debug/debug.h" #include "src/heap/heap-inl.h" -#include "src/log.h" +#include "src/logging/counters.h" +#include "src/logging/log.h" #include "src/macro-assembler.h" #include "src/objects-inl.h" #include "src/objects/slots.h" diff --git a/src/snapshot/deserializer.cc b/src/snapshot/deserializer.cc index fc434211e4..3d5f276562 100644 --- a/src/snapshot/deserializer.cc +++ b/src/snapshot/deserializer.cc @@ -10,7 +10,7 @@ #include "src/heap/read-only-heap.h" #include "src/interpreter/interpreter.h" #include "src/isolate.h" -#include "src/log.h" +#include "src/logging/log.h" #include "src/objects-body-descriptors-inl.h" #include "src/objects/api-callbacks.h" #include "src/objects/cell-inl.h" diff --git a/src/snapshot/embedded-file-writer.h b/src/snapshot/embedded-file-writer.h index dbe8100cab..a4aca5c47d 100644 --- a/src/snapshot/embedded-file-writer.h +++ b/src/snapshot/embedded-file-writer.h @@ -14,7 +14,7 @@ #include "src/source-position-table.h" #if defined(V8_OS_WIN_X64) -#include "src/unwinding-info-win64.h" +#include "src/diagnostics/unwinding-info-win64.h" #endif namespace v8 { diff --git a/src/snapshot/serializer.h b/src/snapshot/serializer.h index 9f7c0ac90c..fc51eb448c 100644 --- a/src/snapshot/serializer.h +++ b/src/snapshot/serializer.h @@ -8,7 +8,7 @@ #include #include "src/isolate.h" -#include "src/log.h" +#include "src/logging/log.h" #include "src/objects.h" #include "src/snapshot/embedded-data.h" #include "src/snapshot/serializer-allocator.h" diff --git a/src/snapshot/snapshot-common.cc b/src/snapshot/snapshot-common.cc index a826a3884d..48f7c8081b 100644 --- a/src/snapshot/snapshot-common.cc +++ b/src/snapshot/snapshot-common.cc @@ -7,7 +7,7 @@ #include "src/snapshot/snapshot.h" #include "src/base/platform/platform.h" -#include "src/counters.h" +#include "src/logging/counters.h" #include "src/memcopy.h" #include "src/snapshot/partial-deserializer.h" #include "src/snapshot/read-only-deserializer.h" diff --git a/src/string-stream.cc b/src/string-stream.cc index b7dc06f373..26ed4faca3 100644 --- a/src/string-stream.cc +++ b/src/string-stream.cc @@ -7,7 +7,7 @@ #include #include "src/handles-inl.h" -#include "src/log.h" +#include "src/logging/log.h" #include "src/objects-inl.h" #include "src/objects/js-array-inl.h" #include "src/objects/prototype.h" diff --git a/src/tracing/trace-event.cc b/src/tracing/trace-event.cc index 41c59269e8..fb3059b4c5 100644 --- a/src/tracing/trace-event.cc +++ b/src/tracing/trace-event.cc @@ -6,8 +6,8 @@ #include -#include "src/counters.h" #include "src/isolate.h" +#include "src/logging/counters.h" #include "src/tracing/traced-value.h" #include "src/v8.h" diff --git a/src/tracing/tracing-category-observer.cc b/src/tracing/tracing-category-observer.cc index d7d3a69c77..276aed1adb 100644 --- a/src/tracing/tracing-category-observer.cc +++ b/src/tracing/tracing-category-observer.cc @@ -5,7 +5,7 @@ #include "src/tracing/tracing-category-observer.h" #include "src/base/atomic-utils.h" -#include "src/counters.h" +#include "src/logging/counters.h" #include "src/tracing/trace-event.h" #include "src/v8.h" diff --git a/src/vm-state-inl.h b/src/vm-state-inl.h index 34cdb572c6..70c05ff68f 100644 --- a/src/vm-state-inl.h +++ b/src/vm-state-inl.h @@ -5,10 +5,10 @@ #ifndef V8_VM_STATE_INL_H_ #define V8_VM_STATE_INL_H_ -#include "src/vm-state.h" -#include "src/log.h" +#include "src/logging/log.h" #include "src/simulator.h" #include "src/tracing/trace-event.h" +#include "src/vm-state.h" namespace v8 { namespace internal { diff --git a/src/vm-state.h b/src/vm-state.h index a9bd08b6cd..98b14b1848 100644 --- a/src/vm-state.h +++ b/src/vm-state.h @@ -6,7 +6,7 @@ #define V8_VM_STATE_H_ #include "src/allocation.h" -#include "src/counters.h" +#include "src/logging/counters.h" namespace v8 { namespace internal { diff --git a/src/wasm/baseline/liftoff-compiler.cc b/src/wasm/baseline/liftoff-compiler.cc index 3b6d651462..8f76eae3b4 100644 --- a/src/wasm/baseline/liftoff-compiler.cc +++ b/src/wasm/baseline/liftoff-compiler.cc @@ -9,9 +9,9 @@ // TODO(clemensh): Remove dependences on compiler stuff. #include "src/compiler/linkage.h" #include "src/compiler/wasm-compiler.h" -#include "src/counters.h" #include "src/interface-descriptors.h" -#include "src/log.h" +#include "src/logging/counters.h" +#include "src/logging/log.h" #include "src/macro-assembler-inl.h" #include "src/objects/smi.h" #include "src/ostreams.h" diff --git a/src/wasm/function-compiler.cc b/src/wasm/function-compiler.cc index 38bfce6a8e..b7dc0f6842 100644 --- a/src/wasm/function-compiler.cc +++ b/src/wasm/function-compiler.cc @@ -5,7 +5,7 @@ #include "src/wasm/function-compiler.h" #include "src/compiler/wasm-compiler.h" -#include "src/counters.h" +#include "src/logging/counters.h" #include "src/macro-assembler-inl.h" #include "src/wasm/baseline/liftoff-compiler.h" #include "src/wasm/wasm-code-manager.h" diff --git a/src/wasm/js-to-wasm-wrapper-cache.h b/src/wasm/js-to-wasm-wrapper-cache.h index ff5fb8de72..ba2093d2c1 100644 --- a/src/wasm/js-to-wasm-wrapper-cache.h +++ b/src/wasm/js-to-wasm-wrapper-cache.h @@ -6,7 +6,7 @@ #define V8_WASM_JS_TO_WASM_WRAPPER_CACHE_H_ #include "src/compiler/wasm-compiler.h" -#include "src/counters.h" +#include "src/logging/counters.h" #include "src/wasm/value-type.h" #include "src/wasm/wasm-code-manager.h" diff --git a/src/wasm/module-compiler.cc b/src/wasm/module-compiler.cc index 625e87c4aa..cf79012162 100644 --- a/src/wasm/module-compiler.cc +++ b/src/wasm/module-compiler.cc @@ -15,9 +15,9 @@ #include "src/base/template-utils.h" #include "src/base/utils/random-number-generator.h" #include "src/compiler/wasm-compiler.h" -#include "src/counters.h" #include "src/heap/heap-inl.h" // For CodeSpaceMemoryModificationScope. #include "src/identity-map.h" +#include "src/logging/counters.h" #include "src/objects/property-descriptor.h" #include "src/task-utils.h" #include "src/tracing/trace-event.h" diff --git a/src/wasm/module-decoder.cc b/src/wasm/module-decoder.cc index 48c9fadb94..f0055a55b4 100644 --- a/src/wasm/module-decoder.cc +++ b/src/wasm/module-decoder.cc @@ -7,8 +7,8 @@ #include "src/base/functional.h" #include "src/base/platform/platform.h" #include "src/base/template-utils.h" -#include "src/counters.h" #include "src/flags.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" #include "src/ostreams.h" #include "src/v8.h" diff --git a/src/wasm/module-instantiate.cc b/src/wasm/module-instantiate.cc index 667d305b60..3fec69775a 100644 --- a/src/wasm/module-instantiate.cc +++ b/src/wasm/module-instantiate.cc @@ -5,7 +5,7 @@ #include "src/wasm/module-instantiate.h" #include "src/asmjs/asm-js.h" -#include "src/counters.h" +#include "src/logging/counters.h" #include "src/numbers/conversions-inl.h" #include "src/objects/property-descriptor.h" #include "src/tracing/trace-event.h" diff --git a/src/wasm/wasm-code-manager.cc b/src/wasm/wasm-code-manager.cc index 579c3532c0..48868b78ff 100644 --- a/src/wasm/wasm-code-manager.cc +++ b/src/wasm/wasm-code-manager.cc @@ -11,10 +11,10 @@ #include "src/base/macros.h" #include "src/base/platform/platform.h" #include "src/base/small-vector.h" -#include "src/counters.h" -#include "src/disassembler.h" +#include "src/diagnostics/disassembler.h" #include "src/globals.h" -#include "src/log.h" +#include "src/logging/counters.h" +#include "src/logging/log.h" #include "src/macro-assembler-inl.h" #include "src/macro-assembler.h" #include "src/objects-inl.h" @@ -30,7 +30,7 @@ #include "src/wasm/wasm-objects.h" #if defined(V8_OS_WIN_X64) -#include "src/unwinding-info-win64.h" +#include "src/diagnostics/unwinding-info-win64.h" #endif #define TRACE_HEAP(...) \ diff --git a/src/wasm/wasm-engine.cc b/src/wasm/wasm-engine.cc index 8a288ac384..35812a53da 100644 --- a/src/wasm/wasm-engine.cc +++ b/src/wasm/wasm-engine.cc @@ -7,8 +7,8 @@ #include "src/base/platform/time.h" #include "src/code-tracer.h" #include "src/compilation-statistics.h" -#include "src/counters.h" #include "src/frames.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" #include "src/objects/heap-number.h" #include "src/objects/js-promise.h" diff --git a/src/wasm/wasm-import-wrapper-cache.cc b/src/wasm/wasm-import-wrapper-cache.cc index caa9eb7904..3d2b58f024 100644 --- a/src/wasm/wasm-import-wrapper-cache.cc +++ b/src/wasm/wasm-import-wrapper-cache.cc @@ -6,7 +6,7 @@ #include -#include "src/counters.h" +#include "src/logging/counters.h" #include "src/wasm/wasm-code-manager.h" namespace v8 { diff --git a/src/wasm/wasm-memory.cc b/src/wasm/wasm-memory.cc index 8bbf215e2a..69deb90f77 100644 --- a/src/wasm/wasm-memory.cc +++ b/src/wasm/wasm-memory.cc @@ -4,8 +4,8 @@ #include -#include "src/counters.h" #include "src/heap/heap-inl.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" #include "src/objects/js-array-buffer-inl.h" #include "src/wasm/wasm-engine.h" diff --git a/src/wasm/wasm-objects.cc b/src/wasm/wasm-objects.cc index e8210099b7..e01e5a0ddf 100644 --- a/src/wasm/wasm-objects.cc +++ b/src/wasm/wasm-objects.cc @@ -9,8 +9,8 @@ #include "src/base/iterator.h" #include "src/code-factory.h" #include "src/compiler/wasm-compiler.h" -#include "src/counters.h" #include "src/debug/debug-interface.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" #include "src/objects/debug-objects-inl.h" #include "src/objects/shared-function-info.h" diff --git a/src/x64/assembler-x64.h b/src/x64/assembler-x64.h index 5186cd4d59..e335f93ede 100644 --- a/src/x64/assembler-x64.h +++ b/src/x64/assembler-x64.h @@ -48,7 +48,7 @@ #include "src/x64/register-x64.h" #include "src/x64/sse-instr.h" #if defined(V8_OS_WIN_X64) -#include "src/unwinding-info-win64.h" +#include "src/diagnostics/unwinding-info-win64.h" #endif namespace v8 { diff --git a/src/x64/disasm-x64.cc b/src/x64/disasm-x64.cc index 53321104c4..251844ffd2 100644 --- a/src/x64/disasm-x64.cc +++ b/src/x64/disasm-x64.cc @@ -12,7 +12,7 @@ #include "src/base/compiler-specific.h" #include "src/base/lazy-instance.h" #include "src/base/v8-fallthrough.h" -#include "src/disasm.h" +#include "src/diagnostics/disasm.h" #include "src/utils.h" #include "src/x64/register-x64.h" #include "src/x64/sse-instr.h" diff --git a/src/x64/eh-frame-x64.cc b/src/x64/eh-frame-x64.cc index 45f758a774..f8c5447126 100644 --- a/src/x64/eh-frame-x64.cc +++ b/src/x64/eh-frame-x64.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "src/eh-frame.h" +#include "src/diagnostics/eh-frame.h" #include "src/zone/zone-containers.h" namespace v8 { diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc index 7f51ae75e8..388a9eb78d 100644 --- a/src/x64/macro-assembler-x64.cc +++ b/src/x64/macro-assembler-x64.cc @@ -9,13 +9,13 @@ #include "src/base/utils/random-number-generator.h" #include "src/callable.h" #include "src/code-factory.h" -#include "src/counters.h" #include "src/debug/debug.h" #include "src/external-reference-table.h" #include "src/frames-inl.h" #include "src/globals.h" #include "src/heap/heap-inl.h" // For MemoryChunk. #include "src/init/bootstrapper.h" +#include "src/logging/counters.h" #include "src/macro-assembler.h" #include "src/objects-inl.h" #include "src/objects/smi.h" diff --git a/test/cctest/compiler/test-basic-block-profiler.cc b/test/cctest/compiler/test-basic-block-profiler.cc index 0414532002..b445a8eaf1 100644 --- a/test/cctest/compiler/test-basic-block-profiler.cc +++ b/test/cctest/compiler/test-basic-block-profiler.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "src/basic-block-profiler.h" +#include "src/diagnostics/basic-block-profiler.h" #include "src/objects-inl.h" #include "test/cctest/cctest.h" #include "test/cctest/compiler/codegen-tester.h" diff --git a/test/cctest/test-assembler-arm.cc b/test/cctest/test-assembler-arm.cc index 10031f654b..e2a056f176 100644 --- a/test/cctest/test-assembler-arm.cc +++ b/test/cctest/test-assembler-arm.cc @@ -29,7 +29,7 @@ #include "src/assembler-inl.h" #include "src/base/utils/random-number-generator.h" -#include "src/disassembler.h" +#include "src/diagnostics/disassembler.h" #include "src/heap/factory.h" #include "src/macro-assembler.h" #include "src/numbers/double.h" diff --git a/test/cctest/test-assembler-ia32.cc b/test/cctest/test-assembler-ia32.cc index 9ac625ffe3..c78cb11315 100644 --- a/test/cctest/test-assembler-ia32.cc +++ b/test/cctest/test-assembler-ia32.cc @@ -32,7 +32,7 @@ #include "src/assembler-inl.h" #include "src/base/platform/platform.h" #include "src/base/utils/random-number-generator.h" -#include "src/disassembler.h" +#include "src/diagnostics/disassembler.h" #include "src/heap/factory.h" #include "src/macro-assembler.h" #include "src/ostreams.h" diff --git a/test/cctest/test-assembler-mips.cc b/test/cctest/test-assembler-mips.cc index 43c668439d..1c74f0a627 100644 --- a/test/cctest/test-assembler-mips.cc +++ b/test/cctest/test-assembler-mips.cc @@ -31,7 +31,7 @@ #include "src/assembler-inl.h" #include "src/base/utils/random-number-generator.h" -#include "src/disassembler.h" +#include "src/diagnostics/disassembler.h" #include "src/heap/factory.h" #include "src/macro-assembler.h" #include "src/simulator.h" diff --git a/test/cctest/test-assembler-mips64.cc b/test/cctest/test-assembler-mips64.cc index c141a19aca..848773fed9 100644 --- a/test/cctest/test-assembler-mips64.cc +++ b/test/cctest/test-assembler-mips64.cc @@ -31,7 +31,7 @@ #include "src/assembler-inl.h" #include "src/base/utils/random-number-generator.h" -#include "src/disassembler.h" +#include "src/diagnostics/disassembler.h" #include "src/heap/factory.h" #include "src/macro-assembler.h" #include "src/simulator.h" diff --git a/test/cctest/test-assembler-ppc.cc b/test/cctest/test-assembler-ppc.cc index 79a589f419..81aa538997 100644 --- a/test/cctest/test-assembler-ppc.cc +++ b/test/cctest/test-assembler-ppc.cc @@ -27,7 +27,7 @@ #include "src/v8.h" -#include "src/disassembler.h" +#include "src/diagnostics/disassembler.h" #include "src/heap/factory.h" #include "src/ppc/assembler-ppc-inl.h" #include "src/simulator.h" diff --git a/test/cctest/test-assembler-s390.cc b/test/cctest/test-assembler-s390.cc index b1db6b6d56..81d047ecc5 100644 --- a/test/cctest/test-assembler-s390.cc +++ b/test/cctest/test-assembler-s390.cc @@ -27,7 +27,7 @@ #include "src/v8.h" -#include "src/disassembler.h" +#include "src/diagnostics/disassembler.h" #include "src/heap/factory.h" #include "src/macro-assembler.h" #include "src/s390/assembler-s390-inl.h" diff --git a/test/cctest/test-compiler.cc b/test/cctest/test-compiler.cc index 8b1732a83c..b1d4e18063 100644 --- a/test/cctest/test-compiler.cc +++ b/test/cctest/test-compiler.cc @@ -33,7 +33,7 @@ #include "src/api/api-inl.h" #include "src/compilation-cache.h" #include "src/compiler.h" -#include "src/disasm.h" +#include "src/diagnostics/disasm.h" #include "src/heap/factory.h" #include "src/heap/spaces.h" #include "src/interpreter/interpreter.h" diff --git a/test/cctest/test-cpu-profiler.cc b/test/cctest/test-cpu-profiler.cc index dac240cf6f..1ae7626389 100644 --- a/test/cctest/test-cpu-profiler.cc +++ b/test/cctest/test-cpu-profiler.cc @@ -37,7 +37,7 @@ #include "src/base/platform/platform.h" #include "src/deoptimizer.h" #include "src/libplatform/default-platform.h" -#include "src/log.h" +#include "src/logging/log.h" #include "src/objects-inl.h" #include "src/profiler/cpu-profiler-inl.h" #include "src/profiler/profiler-listener.h" diff --git a/test/cctest/test-disasm-arm.cc b/test/cctest/test-disasm-arm.cc index 0f6f845ca4..a2d8f1162e 100644 --- a/test/cctest/test-disasm-arm.cc +++ b/test/cctest/test-disasm-arm.cc @@ -36,8 +36,8 @@ #include "src/assembler-inl.h" #include "src/boxed-float.h" #include "src/debug/debug.h" -#include "src/disasm.h" -#include "src/disassembler.h" +#include "src/diagnostics/disasm.h" +#include "src/diagnostics/disassembler.h" #include "src/frames-inl.h" #include "src/macro-assembler.h" #include "src/numbers/double.h" diff --git a/test/cctest/test-disasm-ia32.cc b/test/cctest/test-disasm-ia32.cc index 206e04025a..f204ad7010 100644 --- a/test/cctest/test-disasm-ia32.cc +++ b/test/cctest/test-disasm-ia32.cc @@ -31,8 +31,8 @@ #include "src/code-factory.h" #include "src/debug/debug.h" -#include "src/disasm.h" -#include "src/disassembler.h" +#include "src/diagnostics/disasm.h" +#include "src/diagnostics/disassembler.h" #include "src/frames-inl.h" #include "src/macro-assembler.h" #include "src/ostreams.h" diff --git a/test/cctest/test-disasm-mips.cc b/test/cctest/test-disasm-mips.cc index d2a5a9890a..7033d8cb30 100644 --- a/test/cctest/test-disasm-mips.cc +++ b/test/cctest/test-disasm-mips.cc @@ -31,8 +31,8 @@ #include "src/v8.h" #include "src/debug/debug.h" -#include "src/disasm.h" -#include "src/disassembler.h" +#include "src/diagnostics/disasm.h" +#include "src/diagnostics/disassembler.h" #include "src/frames-inl.h" #include "src/macro-assembler.h" #include "test/cctest/cctest.h" diff --git a/test/cctest/test-disasm-mips64.cc b/test/cctest/test-disasm-mips64.cc index 93760fa005..e09c94754e 100644 --- a/test/cctest/test-disasm-mips64.cc +++ b/test/cctest/test-disasm-mips64.cc @@ -31,8 +31,8 @@ #include "src/v8.h" #include "src/debug/debug.h" -#include "src/disasm.h" -#include "src/disassembler.h" +#include "src/diagnostics/disasm.h" +#include "src/diagnostics/disassembler.h" #include "src/frames-inl.h" #include "src/macro-assembler.h" #include "test/cctest/cctest.h" diff --git a/test/cctest/test-disasm-ppc.cc b/test/cctest/test-disasm-ppc.cc index 5cd15c2a5b..ee611e21c7 100644 --- a/test/cctest/test-disasm-ppc.cc +++ b/test/cctest/test-disasm-ppc.cc @@ -31,8 +31,8 @@ #include "src/v8.h" #include "src/debug/debug.h" -#include "src/disasm.h" -#include "src/disassembler.h" +#include "src/diagnostics/disasm.h" +#include "src/diagnostics/disassembler.h" #include "src/frames-inl.h" #include "src/macro-assembler.h" #include "test/cctest/cctest.h" diff --git a/test/cctest/test-disasm-s390.cc b/test/cctest/test-disasm-s390.cc index 3a34dd7ddb..12a483f38d 100644 --- a/test/cctest/test-disasm-s390.cc +++ b/test/cctest/test-disasm-s390.cc @@ -31,8 +31,8 @@ #include "src/v8.h" #include "src/debug/debug.h" -#include "src/disasm.h" -#include "src/disassembler.h" +#include "src/diagnostics/disasm.h" +#include "src/diagnostics/disassembler.h" #include "src/frames-inl.h" #include "src/macro-assembler.h" #include "test/cctest/cctest.h" diff --git a/test/cctest/test-disasm-x64.cc b/test/cctest/test-disasm-x64.cc index 7a5570c827..f6ad7bc859 100644 --- a/test/cctest/test-disasm-x64.cc +++ b/test/cctest/test-disasm-x64.cc @@ -31,8 +31,8 @@ #include "src/code-factory.h" #include "src/debug/debug.h" -#include "src/disasm.h" -#include "src/disassembler.h" +#include "src/diagnostics/disasm.h" +#include "src/diagnostics/disassembler.h" #include "src/frames-inl.h" #include "src/macro-assembler.h" #include "src/objects-inl.h" diff --git a/test/cctest/test-log-stack-tracer.cc b/test/cctest/test-log-stack-tracer.cc index 2813475ad2..98db43fa99 100644 --- a/test/cctest/test-log-stack-tracer.cc +++ b/test/cctest/test-log-stack-tracer.cc @@ -31,7 +31,7 @@ #include "include/v8-profiler.h" #include "src/api/api-inl.h" -#include "src/disassembler.h" +#include "src/diagnostics/disassembler.h" #include "src/isolate.h" #include "src/objects-inl.h" #include "src/v8.h" diff --git a/test/cctest/test-log.cc b/test/cctest/test-log.cc index 3b8cfc7217..bb8320fa66 100644 --- a/test/cctest/test-log.cc +++ b/test/cctest/test-log.cc @@ -32,8 +32,8 @@ #include "src/api/api-inl.h" #include "src/builtins/builtins.h" #include "src/compilation-cache.h" -#include "src/log-utils.h" -#include "src/log.h" +#include "src/logging/log-utils.h" +#include "src/logging/log.h" #include "src/objects-inl.h" #include "src/ostreams.h" #include "src/profiler/cpu-profiler.h" diff --git a/test/cctest/test-poison-disasm-arm.cc b/test/cctest/test-poison-disasm-arm.cc index 44f85a9edf..989a0d0a47 100644 --- a/test/cctest/test-poison-disasm-arm.cc +++ b/test/cctest/test-poison-disasm-arm.cc @@ -7,7 +7,7 @@ #include // NOLINT(build/c++11) #include "src/api/api-inl.h" -#include "src/disassembler.h" +#include "src/diagnostics/disassembler.h" #include "src/objects-inl.h" #include "test/cctest/cctest.h" diff --git a/test/cctest/test-profile-generator.cc b/test/cctest/test-profile-generator.cc index 0f0fe27aea..13005f0924 100644 --- a/test/cctest/test-profile-generator.cc +++ b/test/cctest/test-profile-generator.cc @@ -29,7 +29,7 @@ #include "include/v8-profiler.h" #include "src/api/api-inl.h" -#include "src/log.h" +#include "src/logging/log.h" #include "src/objects-inl.h" #include "src/profiler/cpu-profiler.h" #include "src/profiler/profile-generator-inl.h" diff --git a/test/cctest/test-sync-primitives-arm.cc b/test/cctest/test-sync-primitives-arm.cc index e32136b81d..ff3259c1dd 100644 --- a/test/cctest/test-sync-primitives-arm.cc +++ b/test/cctest/test-sync-primitives-arm.cc @@ -30,7 +30,7 @@ #include "test/cctest/cctest.h" #include "src/assembler-inl.h" -#include "src/disassembler.h" +#include "src/diagnostics/disassembler.h" #include "src/heap/factory.h" #include "src/macro-assembler.h" #include "src/simulator.h" diff --git a/test/unittests/counters-unittest.cc b/test/unittests/counters-unittest.cc index 9a0abcea34..8f3399048c 100644 --- a/test/unittests/counters-unittest.cc +++ b/test/unittests/counters-unittest.cc @@ -7,9 +7,9 @@ #include "src/api/api-inl.h" #include "src/base/atomic-utils.h" #include "src/base/platform/time.h" -#include "src/counters-inl.h" -#include "src/counters.h" #include "src/handles-inl.h" +#include "src/logging/counters-inl.h" +#include "src/logging/counters.h" #include "src/objects-inl.h" #include "src/tracing/tracing-category-observer.h" diff --git a/test/unittests/eh-frame-iterator-unittest.cc b/test/unittests/eh-frame-iterator-unittest.cc index fff38209c5..3a97c63553 100644 --- a/test/unittests/eh-frame-iterator-unittest.cc +++ b/test/unittests/eh-frame-iterator-unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "src/eh-frame.h" +#include "src/diagnostics/eh-frame.h" #include "testing/gtest/include/gtest/gtest.h" namespace v8 { diff --git a/test/unittests/eh-frame-writer-unittest.cc b/test/unittests/eh-frame-writer-unittest.cc index 52501b462e..25a54b3849 100644 --- a/test/unittests/eh-frame-writer-unittest.cc +++ b/test/unittests/eh-frame-writer-unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "src/eh-frame.h" +#include "src/diagnostics/eh-frame.h" #include "test/unittests/test-utils.h" namespace v8 {