[iwyu] Split frame-constants.h out of frames.h to reduce transitive includes.

R=mstarzinger@chromium.org

Bug: 
Change-Id: I95acea7b33a6e5799399d0891b2a52103f5e4964
Reviewed-on: https://chromium-review.googlesource.com/598072Reviewed-by: Ben Titzer <titzer@chromium.org>
Reviewed-by: Yang Guo <yangguo@chromium.org>
Reviewed-by: Ross McIlroy <rmcilroy@chromium.org>
Commit-Queue: Ben Titzer <titzer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#47116}

BUILD.gn

@@ -1546,6 +1546,7 @@ v8_source_set("v8_base") {
     "src/flag-definitions.h",
     "src/flags.cc",
     "src/flags.h",
+    "src/frame-constants.h",
     "src/frames-inl.h",
     "src/frames.cc",
     "src/frames.h",
@@ -2055,8 +2056,8 @@ v8_source_set("v8_base") {
       "src/ia32/cpu-ia32.cc",
       "src/ia32/deoptimizer-ia32.cc",
       "src/ia32/disasm-ia32.cc",
-      "src/ia32/frames-ia32.cc",
-      "src/ia32/frames-ia32.h",
+      "src/ia32/frame-constants-ia32.cc",
+      "src/ia32/frame-constants-ia32.h",
       "src/ia32/interface-descriptors-ia32.cc",
       "src/ia32/macro-assembler-ia32.cc",
       "src/ia32/macro-assembler-ia32.h",
@@ -2096,8 +2097,8 @@ v8_source_set("v8_base") {
       "src/x64/deoptimizer-x64.cc",
       "src/x64/disasm-x64.cc",
       "src/x64/eh-frame-x64.cc",
-      "src/x64/frames-x64.cc",
-      "src/x64/frames-x64.h",
+      "src/x64/frame-constants-x64.cc",
+      "src/x64/frame-constants-x64.h",
       "src/x64/interface-descriptors-x64.cc",
       "src/x64/macro-assembler-x64.cc",
       "src/x64/macro-assembler-x64.h",
@@ -2123,8 +2124,8 @@ v8_source_set("v8_base") {
       "src/arm/deoptimizer-arm.cc",
       "src/arm/disasm-arm.cc",
       "src/arm/eh-frame-arm.cc",
-      "src/arm/frames-arm.cc",
-      "src/arm/frames-arm.h",
+      "src/arm/frame-constants-arm.cc",
+      "src/arm/frame-constants-arm.h",
       "src/arm/interface-descriptors-arm.cc",
       "src/arm/interface-descriptors-arm.h",
       "src/arm/macro-assembler-arm.cc",
@@ -2163,8 +2164,8 @@ v8_source_set("v8_base") {
       "src/arm64/disasm-arm64.cc",
       "src/arm64/disasm-arm64.h",
       "src/arm64/eh-frame-arm64.cc",
-      "src/arm64/frames-arm64.cc",
-      "src/arm64/frames-arm64.h",
+      "src/arm64/frame-constants-arm64.cc",
+      "src/arm64/frame-constants-arm64.h",
       "src/arm64/instructions-arm64.cc",
       "src/arm64/instructions-arm64.h",
       "src/arm64/instrument-arm64.cc",
@@ -2216,8 +2217,8 @@ v8_source_set("v8_base") {
       "src/mips/cpu-mips.cc",
       "src/mips/deoptimizer-mips.cc",
       "src/mips/disasm-mips.cc",
-      "src/mips/frames-mips.cc",
-      "src/mips/frames-mips.h",
+      "src/mips/frame-constants-mips.cc",
+      "src/mips/frame-constants-mips.h",
       "src/mips/interface-descriptors-mips.cc",
       "src/mips/macro-assembler-mips.cc",
       "src/mips/macro-assembler-mips.h",
@@ -2249,8 +2250,8 @@ v8_source_set("v8_base") {
       "src/mips64/cpu-mips64.cc",
       "src/mips64/deoptimizer-mips64.cc",
       "src/mips64/disasm-mips64.cc",
-      "src/mips64/frames-mips64.cc",
-      "src/mips64/frames-mips64.h",
+      "src/mips64/frame-constants-mips64.cc",
+      "src/mips64/frame-constants-mips64.h",
       "src/mips64/interface-descriptors-mips64.cc",
       "src/mips64/macro-assembler-mips64.cc",
       "src/mips64/macro-assembler-mips64.h",
@@ -2282,8 +2283,8 @@ v8_source_set("v8_base") {
       "src/ppc/cpu-ppc.cc",
       "src/ppc/deoptimizer-ppc.cc",
       "src/ppc/disasm-ppc.cc",
-      "src/ppc/frames-ppc.cc",
-      "src/ppc/frames-ppc.h",
+      "src/ppc/frame-constants-ppc.cc",
+      "src/ppc/frame-constants-ppc.h",
       "src/ppc/interface-descriptors-ppc.cc",
       "src/ppc/macro-assembler-ppc.cc",
       "src/ppc/macro-assembler-ppc.h",
@@ -2317,8 +2318,8 @@ v8_source_set("v8_base") {
       "src/s390/cpu-s390.cc",
       "src/s390/deoptimizer-s390.cc",
       "src/s390/disasm-s390.cc",
-      "src/s390/frames-s390.cc",
-      "src/s390/frames-s390.h",
+      "src/s390/frame-constants-s390.cc",
+      "src/s390/frame-constants-s390.h",
       "src/s390/interface-descriptors-s390.cc",
       "src/s390/macro-assembler-s390.cc",
       "src/s390/macro-assembler-s390.h",

src/arm/frames-arm.cc → src/arm/frame-constants-arm.cc

@@ -5,24 +5,20 @@
 #if V8_TARGET_ARCH_ARM
 
 #include "src/assembler.h"
-#include "src/frames.h"
+#include "src/frame-constants.h"
 #include "src/macro-assembler.h"
 
 #include "src/arm/assembler-arm-inl.h"
 #include "src/arm/assembler-arm.h"
-#include "src/arm/frames-arm.h"
+#include "src/arm/frame-constants-arm.h"
 #include "src/arm/macro-assembler-arm.h"
 
 namespace v8 {
 namespace internal {
 
-
 Register JavaScriptFrame::fp_register() { return v8::internal::fp; }
 Register JavaScriptFrame::context_register() { return cp; }
-Register JavaScriptFrame::constant_pool_pointer_register() {
-  UNREACHABLE();
-}
-
+Register JavaScriptFrame::constant_pool_pointer_register() { UNREACHABLE(); }
 
 }  // namespace internal
 }  // namespace v8

src/arm/frames-arm.h → src/arm/frame-constants-arm.h

@@ -30,7 +30,6 @@ class ExitFrameConstants : public TypedFrameConstants {
   static const int kCallerSPDisplacement = 2 * kPointerSize;
 };
 
-
 class JavaScriptFrameConstants : public AllStatic {
  public:
   // FP-relative.
@@ -39,7 +38,7 @@ class JavaScriptFrameConstants : public AllStatic {
   static const int kFunctionOffset = StandardFrameConstants::kFunctionOffset;
 
   // Caller SP-relative.
-  static const int kParam0Offset   = -2 * kPointerSize;
+  static const int kParam0Offset = -2 * kPointerSize;
   static const int kReceiverOffset = -1 * kPointerSize;
 };
 

src/arm64/assembler-arm64.cc

@@ -31,10 +31,10 @@
 #include "src/arm64/assembler-arm64.h"
 
 #include "src/arm64/assembler-arm64-inl.h"
-#include "src/arm64/frames-arm64.h"
 #include "src/base/bits.h"
 #include "src/base/cpu.h"
 #include "src/code-stubs.h"
+#include "src/frame-constants.h"
 #include "src/register-configuration.h"
 
 namespace v8 {

src/arm64/code-stubs-arm64.cc

@@ -6,12 +6,12 @@
 
 #include "src/api-arguments.h"
 #include "src/arm64/assembler-arm64-inl.h"
-#include "src/arm64/frames-arm64.h"
 #include "src/arm64/macro-assembler-arm64-inl.h"
 #include "src/bootstrapper.h"
 #include "src/code-stubs.h"
 #include "src/codegen.h"
 #include "src/counters.h"
+#include "src/frame-constants.h"
 #include "src/frames-inl.h"
 #include "src/heap/heap-inl.h"
 #include "src/ic/handler-compiler.h"

src/arm64/deoptimizer-arm64.cc

@@ -4,10 +4,10 @@
 
 #include "src/api.h"
 #include "src/arm64/assembler-arm64-inl.h"
-#include "src/arm64/frames-arm64.h"
 #include "src/arm64/macro-assembler-arm64-inl.h"
 #include "src/codegen.h"
 #include "src/deoptimizer.h"
+#include "src/frame-constants.h"
 #include "src/frames-inl.h"
 #include "src/full-codegen/full-codegen.h"
 #include "src/register-configuration.h"

src/arm64/frames-arm64.cc → src/arm64/frame-constants-arm64.cc

@@ -2,25 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/arm64/frames-arm64.h"
+#include "src/frame-constants.h"
 
 #if V8_TARGET_ARCH_ARM64
 
 #include "src/arm64/assembler-arm64-inl.h"
 #include "src/arm64/assembler-arm64.h"
 #include "src/assembler.h"
-#include "src/frames.h"
+
+#include "src/arm64/frame-constants-arm64.h"
 
 namespace v8 {
 namespace internal {
 
-
 Register JavaScriptFrame::fp_register() { return v8::internal::fp; }
 Register JavaScriptFrame::context_register() { return cp; }
-Register JavaScriptFrame::constant_pool_pointer_register() {
-  UNREACHABLE();
-}
-
+Register JavaScriptFrame::constant_pool_pointer_register() { UNREACHABLE(); }
 
 }  // namespace internal
 }  // namespace v8

src/arm64/frames-arm64.h → src/arm64/frame-constants-arm64.h

@@ -22,12 +22,11 @@ class ExitFrameConstants : public TypedFrameConstants {
   static const int kSPOffset = TYPED_FRAME_PUSHED_VALUE_OFFSET(0);
   static const int kCodeOffset = TYPED_FRAME_PUSHED_VALUE_OFFSET(1);
   DEFINE_TYPED_FRAME_SIZES(2);
-  static const int kLastExitFrameField   = kCodeOffset;
+  static const int kLastExitFrameField = kCodeOffset;
 
-  static const int kConstantPoolOffset   = 0;  // Not used
+  static const int kConstantPoolOffset = 0;  // Not used
 };
 
-
 class JavaScriptFrameConstants : public AllStatic {
  public:
   // FP-relative.

src/arm64/macro-assembler-arm64.cc

@@ -4,7 +4,6 @@
 
 #if V8_TARGET_ARCH_ARM64
 
-#include "src/arm64/frames-arm64.h"
 #include "src/assembler.h"
 #include "src/base/bits.h"
 #include "src/base/division-by-constant.h"
@@ -12,6 +11,7 @@
 #include "src/codegen.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"
 #include "src/register-configuration.h"

src/builtins/arm64/builtins-arm64.cc

@@ -4,12 +4,12 @@
 
 #if V8_TARGET_ARCH_ARM64
 
-#include "src/arm64/frames-arm64.h"
 #include "src/arm64/macro-assembler-arm64-inl.h"
 #include "src/codegen.h"
 #include "src/counters.h"
 #include "src/debug/debug.h"
 #include "src/deoptimizer.h"
+#include "src/frame-constants.h"
 #include "src/frames-inl.h"
 #include "src/full-codegen/full-codegen.h"
 #include "src/objects-inl.h"

src/builtins/builtins-arguments-gen.cc

@@ -8,6 +8,7 @@
 #include "src/builtins/builtins.h"
 #include "src/code-factory.h"
 #include "src/code-stub-assembler.h"
+#include "src/frame-constants.h"
 #include "src/interface-descriptors.h"
 #include "src/objects-inl.h"
 

src/builtins/builtins-array-gen.cc

@@ -6,6 +6,7 @@
 #include "src/builtins/builtins-utils-gen.h"
 #include "src/builtins/builtins.h"
 #include "src/code-stub-assembler.h"
+#include "src/frame-constants.h"
 
 namespace v8 {
 namespace internal {

src/builtins/builtins-console-gen.cc

@@ -5,6 +5,7 @@
 #include "src/builtins/builtins-utils-gen.h"
 #include "src/builtins/builtins.h"
 #include "src/code-stub-assembler.h"
+#include "src/frame-constants.h"
 
 namespace v8 {
 namespace internal {

src/builtins/builtins-function-gen.cc

@@ -5,6 +5,7 @@
 #include "src/builtins/builtins-utils-gen.h"
 #include "src/builtins/builtins.h"
 #include "src/code-stub-assembler.h"
+#include "src/frame-constants.h"
 
 namespace v8 {
 namespace internal {

src/builtins/ia32/builtins-ia32.cc

@@ -7,9 +7,9 @@
 #include "src/code-factory.h"
 #include "src/codegen.h"
 #include "src/deoptimizer.h"
+#include "src/frame-constants.h"
 #include "src/frames-inl.h"
 #include "src/full-codegen/full-codegen.h"
-#include "src/ia32/frames-ia32.h"
 
 namespace v8 {
 namespace internal {

src/compiler/arm64/code-generator-arm64.cc

@@ -5,13 +5,13 @@
 #include "src/compiler/code-generator.h"
 
 #include "src/arm64/assembler-arm64-inl.h"
-#include "src/arm64/frames-arm64.h"
 #include "src/arm64/macro-assembler-arm64-inl.h"
 #include "src/compilation-info.h"
 #include "src/compiler/code-generator-impl.h"
 #include "src/compiler/gap-resolver.h"
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/osr.h"
+#include "src/frame-constants.h"
 #include "src/heap/heap-inl.h"
 
 namespace v8 {

src/compiler/bytecode-analysis.h

@@ -10,6 +10,7 @@
 #include "src/compiler/bytecode-liveness-map.h"
 #include "src/handles.h"
 #include "src/interpreter/bytecode-register.h"
+#include "src/utils.h"
 #include "src/zone/zone-containers.h"
 
 namespace v8 {

src/compiler/escape-analysis-reducer.cc

@@ -9,6 +9,7 @@
 #include "src/compiler/simplified-operator.h"
 #include "src/compiler/type-cache.h"
 #include "src/counters.h"
+#include "src/frame-constants.h"
 
 namespace v8 {
 namespace internal {

src/compiler/frame.h

@@ -6,7 +6,7 @@
 #define V8_COMPILER_FRAME_H_
 
 #include "src/bit-vector.h"
-#include "src/frames.h"
+#include "src/frame-constants.h"
 
 namespace v8 {
 namespace internal {

src/compiler/ia32/code-generator-ia32.cc

@@ -9,9 +9,9 @@
 #include "src/compiler/gap-resolver.h"
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/osr.h"
+#include "src/frame-constants.h"
 #include "src/frames.h"
 #include "src/ia32/assembler-ia32.h"
-#include "src/ia32/frames-ia32.h"
 #include "src/ia32/macro-assembler-ia32.h"
 
 namespace v8 {

src/compiler/new-escape-analysis-reducer.cc

@@ -7,6 +7,7 @@
 #include "src/compiler/all-nodes.h"
 #include "src/compiler/simplified-operator.h"
 #include "src/compiler/type-cache.h"
+#include "src/frame-constants.h"
 
 namespace v8 {
 namespace internal {

src/compiler/s390/instruction-selector-s390.cc

@@ -6,7 +6,7 @@
 #include "src/compiler/instruction-selector-impl.h"
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/node-properties.h"
-#include "src/s390/frames-s390.h"
+#include "src/frame-constants.h"
 
 namespace v8 {
 namespace internal {

src/debug/arm64/debug-arm64.cc

@@ -6,10 +6,10 @@
 
 #include "src/debug/debug.h"
 
-#include "src/arm64/frames-arm64.h"
 #include "src/arm64/macro-assembler-arm64-inl.h"
 #include "src/codegen.h"
 #include "src/debug/liveedit.h"
+#include "src/frame-constants.h"
 #include "src/frames-inl.h"
 #include "src/objects-inl.h"
 

src/deoptimizer.h

@@ -8,6 +8,7 @@
 #include "src/allocation.h"
 #include "src/boxed-float.h"
 #include "src/deoptimize-reason.h"
+#include "src/frame-constants.h"
 #include "src/macro-assembler.h"
 #include "src/source-position.h"
 #include "src/zone/zone-chunk-list.h"

src/frames-inl.h

@@ -5,35 +5,15 @@
 #ifndef V8_FRAMES_INL_H_
 #define V8_FRAMES_INL_H_
 
+#include "src/frame-constants.h"
 #include "src/frames.h"
 #include "src/isolate.h"
 #include "src/objects-inl.h"
 #include "src/v8memory.h"
 
-#if V8_TARGET_ARCH_IA32
-#include "src/ia32/frames-ia32.h"  // NOLINT
-#elif V8_TARGET_ARCH_X64
-#include "src/x64/frames-x64.h"  // NOLINT
-#elif V8_TARGET_ARCH_ARM64
-#include "src/arm64/frames-arm64.h"  // NOLINT
-#elif V8_TARGET_ARCH_ARM
-#include "src/arm/frames-arm.h"  // NOLINT
-#elif V8_TARGET_ARCH_PPC
-#include "src/ppc/frames-ppc.h"  // NOLINT
-#elif V8_TARGET_ARCH_MIPS
-#include "src/mips/frames-mips.h"  // NOLINT
-#elif V8_TARGET_ARCH_MIPS64
-#include "src/mips64/frames-mips64.h"  // NOLINT
-#elif V8_TARGET_ARCH_S390
-#include "src/s390/frames-s390.h"  // NOLINT
-#else
-#error Unsupported target architecture.
-#endif
-
 namespace v8 {
 namespace internal {
 
-
 inline Address StackHandler::address() const {
   return reinterpret_cast<Address>(const_cast<StackHandler*>(this));
 }

src/full-codegen/arm64/full-codegen-arm64.cc

@@ -14,13 +14,12 @@
 #include "src/compilation-info.h"
 #include "src/compiler.h"
 #include "src/debug/debug.h"
-#include "src/frames-inl.h"
+#include "src/frame-constants.h"
 #include "src/full-codegen/full-codegen.h"
 #include "src/heap/heap-inl.h"
 #include "src/ic/ic.h"
 
 #include "src/arm64/code-stubs-arm64.h"
-#include "src/arm64/frames-arm64.h"
 #include "src/arm64/macro-assembler-arm64.h"
 
 namespace v8 {

src/full-codegen/ia32/full-codegen-ia32.cc

@@ -13,9 +13,9 @@
 #include "src/compilation-info.h"
 #include "src/compiler.h"
 #include "src/debug/debug.h"
+#include "src/frame-constants.h"
 #include "src/frames-inl.h"
 #include "src/full-codegen/full-codegen.h"
-#include "src/ia32/frames-ia32.h"
 #include "src/ic/ic.h"
 
 namespace v8 {

src/ia32/deoptimizer-ia32.cc

@@ -6,9 +6,9 @@
 
 #include "src/codegen.h"
 #include "src/deoptimizer.h"
+#include "src/frame-constants.h"
 #include "src/frames-inl.h"
 #include "src/full-codegen/full-codegen.h"
-#include "src/ia32/frames-ia32.h"
 #include "src/register-configuration.h"
 #include "src/safepoint-table.h"
 

src/ia32/frames-ia32.cc → src/ia32/frame-constants-ia32.cc

@@ -5,21 +5,18 @@
 #if V8_TARGET_ARCH_IA32
 
 #include "src/assembler.h"
-#include "src/frames.h"
+#include "src/frame-constants.h"
 #include "src/ia32/assembler-ia32-inl.h"
 #include "src/ia32/assembler-ia32.h"
-#include "src/ia32/frames-ia32.h"
+
+#include "src/ia32/frame-constants-ia32.h"
 
 namespace v8 {
 namespace internal {
 
-
 Register JavaScriptFrame::fp_register() { return ebp; }
 Register JavaScriptFrame::context_register() { return esi; }
-Register JavaScriptFrame::constant_pool_pointer_register() {
-  UNREACHABLE();
-}
-
+Register JavaScriptFrame::constant_pool_pointer_register() { UNREACHABLE(); }
 
 }  // namespace internal
 }  // namespace v8

src/ia32/frames-ia32.h → src/ia32/frame-constants-ia32.h

@@ -10,13 +10,13 @@ namespace internal {
 
 class EntryFrameConstants : public AllStatic {
  public:
-  static const int kCallerFPOffset      = -6 * kPointerSize;
+  static const int kCallerFPOffset = -6 * kPointerSize;
 
-  static const int kNewTargetArgOffset  = +2 * kPointerSize;
-  static const int kFunctionArgOffset   = +3 * kPointerSize;
-  static const int kReceiverArgOffset   = +4 * kPointerSize;
-  static const int kArgcOffset          = +5 * kPointerSize;
-  static const int kArgvOffset          = +6 * kPointerSize;
+  static const int kNewTargetArgOffset = +2 * kPointerSize;
+  static const int kFunctionArgOffset = +3 * kPointerSize;
+  static const int kReceiverArgOffset = +4 * kPointerSize;
+  static const int kArgcOffset = +5 * kPointerSize;
+  static const int kArgvOffset = +6 * kPointerSize;
 };
 
 class ExitFrameConstants : public TypedFrameConstants {
@@ -25,17 +25,16 @@ class ExitFrameConstants : public TypedFrameConstants {
   static const int kCodeOffset = TYPED_FRAME_PUSHED_VALUE_OFFSET(1);
   DEFINE_TYPED_FRAME_SIZES(2);
 
-  static const int kCallerFPOffset =  0 * kPointerSize;
+  static const int kCallerFPOffset = 0 * kPointerSize;
   static const int kCallerPCOffset = +1 * kPointerSize;
 
   // FP-relative displacement of the caller's SP.  It points just
   // below the saved PC.
   static const int kCallerSPDisplacement = +2 * kPointerSize;
 
-  static const int kConstantPoolOffset   = 0;  // Not used
+  static const int kConstantPoolOffset = 0;  // Not used
 };
 
-
 class JavaScriptFrameConstants : public AllStatic {
  public:
   // FP-relative.
@@ -44,7 +43,7 @@ class JavaScriptFrameConstants : public AllStatic {
   static const int kFunctionOffset = StandardFrameConstants::kFunctionOffset;
 
   // Caller SP-relative.
-  static const int kParam0Offset   = -2 * kPointerSize;
+  static const int kParam0Offset = -2 * kPointerSize;
   static const int kReceiverOffset = -1 * kPointerSize;
 };
 

src/ia32/macro-assembler-ia32.cc

@@ -11,8 +11,8 @@
 #include "src/codegen.h"
 #include "src/debug/debug.h"
 #include "src/external-reference-table.h"
+#include "src/frame-constants.h"
 #include "src/frames-inl.h"
-#include "src/ia32/frames-ia32.h"
 #include "src/runtime/runtime.h"
 
 #include "src/ia32/macro-assembler-ia32.h"

src/interpreter/bytecode-register.h

@@ -7,7 +7,9 @@
 
 #include "src/interpreter/bytecodes.h"
 
-#include "src/frames.h"
+#include "src/base/macros.h"
+#include "src/base/platform/platform.h"
+#include "src/frame-constants.h"
 #include "src/globals.h"
 
 namespace v8 {

src/interpreter/handler-table-builder.h

@@ -5,6 +5,7 @@
 #ifndef V8_INTERPRETER_HANDLER_TABLE_BUILDER_H_
 #define V8_INTERPRETER_HANDLER_TABLE_BUILDER_H_
 
+#include "src/frames.h"
 #include "src/interpreter/bytecode-register.h"
 #include "src/interpreter/bytecodes.h"
 #include "src/zone/zone-containers.h"

src/interpreter/interpreter-assembler.h

@@ -8,7 +8,6 @@
 #include "src/allocation.h"
 #include "src/builtins/builtins.h"
 #include "src/code-stub-assembler.h"
-#include "src/frames.h"
 #include "src/globals.h"
 #include "src/interpreter/bytecode-register.h"
 #include "src/interpreter/bytecodes.h"

src/mips/frames-mips.cc → src/mips/frame-constants-mips.cc

@@ -5,21 +5,18 @@
 #if V8_TARGET_ARCH_MIPS
 
 #include "src/assembler.h"
-#include "src/frames.h"
+#include "src/frame-constants.h"
 #include "src/mips/assembler-mips-inl.h"
 #include "src/mips/assembler-mips.h"
-#include "src/mips/frames-mips.h"
+
+#include "src/mips/frame-constants-mips.h"
 
 namespace v8 {
 namespace internal {
 
-
 Register JavaScriptFrame::fp_register() { return v8::internal::fp; }
 Register JavaScriptFrame::context_register() { return cp; }
-Register JavaScriptFrame::constant_pool_pointer_register() {
-  UNREACHABLE();
-}
-
+Register JavaScriptFrame::constant_pool_pointer_register() { UNREACHABLE(); }
 
 }  // namespace internal
 }  // namespace v8

src/mips64/frames-mips64.h → src/mips/frame-constants-mips.h

@@ -42,7 +42,7 @@ class JavaScriptFrameConstants : public AllStatic {
   static const int kFunctionOffset = StandardFrameConstants::kFunctionOffset;
 
   // Caller SP-relative.
-  static const int kParam0Offset   = -2 * kPointerSize;
+  static const int kParam0Offset = -2 * kPointerSize;
   static const int kReceiverOffset = -1 * kPointerSize;
 };
 

src/mips64/frames-mips64.cc → src/mips64/frame-constants-mips64.cc

@@ -5,21 +5,18 @@
 #if V8_TARGET_ARCH_MIPS64
 
 #include "src/assembler.h"
-#include "src/frames.h"
+#include "src/frame-constants.h"
 #include "src/mips64/assembler-mips64-inl.h"
 #include "src/mips64/assembler-mips64.h"
-#include "src/mips64/frames-mips64.h"
+
+#include "src/mips64/frame-constants-mips64.h"
 
 namespace v8 {
 namespace internal {
 
-
 Register JavaScriptFrame::fp_register() { return v8::internal::fp; }
 Register JavaScriptFrame::context_register() { return cp; }
-Register JavaScriptFrame::constant_pool_pointer_register() {
-  UNREACHABLE();
-}
-
+Register JavaScriptFrame::constant_pool_pointer_register() { UNREACHABLE(); }
 
 }  // namespace internal
 }  // namespace v8

src/mips/frames-mips.h → src/mips64/frame-constants-mips64.h

@@ -34,7 +34,6 @@ class ExitFrameConstants : public TypedFrameConstants {
   static const int kConstantPoolOffset = 0;  // Not used.
 };
 
-
 class JavaScriptFrameConstants : public AllStatic {
  public:
   // FP-relative.
@@ -43,11 +42,10 @@ class JavaScriptFrameConstants : public AllStatic {
   static const int kFunctionOffset = StandardFrameConstants::kFunctionOffset;
 
   // Caller SP-relative.
-  static const int kParam0Offset   = -2 * kPointerSize;
+  static const int kParam0Offset = -2 * kPointerSize;
   static const int kReceiverOffset = -1 * kPointerSize;
 };
 
-
 }  // namespace internal
 }  // namespace v8
 

src/ppc/frames-ppc.cc → src/ppc/frame-constants-ppc.cc

@@ -5,18 +5,17 @@
 #if V8_TARGET_ARCH_PPC
 
 #include "src/assembler.h"
-#include "src/frames.h"
+#include "src/frame-constants.h"
 #include "src/macro-assembler.h"
-
-#include "src/ppc/assembler-ppc.h"
 #include "src/ppc/assembler-ppc-inl.h"
-#include "src/ppc/frames-ppc.h"
+#include "src/ppc/assembler-ppc.h"
 #include "src/ppc/macro-assembler-ppc.h"
 
+#include "src/ppc/frame-constants-ppc.h"
+
 namespace v8 {
 namespace internal {
 
-
 Register JavaScriptFrame::fp_register() { return v8::internal::fp; }
 Register JavaScriptFrame::context_register() { return cp; }
 Register JavaScriptFrame::constant_pool_pointer_register() {
@@ -24,7 +23,6 @@ Register JavaScriptFrame::constant_pool_pointer_register() {
   return kConstantPoolRegister;
 }
 
-
 }  // namespace internal
 }  // namespace v8
 

src/regexp/ppc/regexp-macro-assembler-ppc.h

@@ -7,7 +7,6 @@
 
 #include "src/macro-assembler.h"
 #include "src/ppc/assembler-ppc.h"
-#include "src/ppc/frames-ppc.h"
 #include "src/regexp/regexp-macro-assembler.h"
 
 namespace v8 {

src/regexp/s390/regexp-macro-assembler-s390.h

@@ -8,7 +8,6 @@
 #include "src/macro-assembler.h"
 #include "src/regexp/regexp-macro-assembler.h"
 #include "src/s390/assembler-s390.h"
-#include "src/s390/frames-s390.h"
 
 namespace v8 {
 namespace internal {

src/runtime/runtime-wasm.cc

@@ -10,6 +10,7 @@
 #include "src/conversions.h"
 #include "src/debug/debug.h"
 #include "src/factory.h"
+#include "src/frame-constants.h"
 #include "src/objects-inl.h"
 #include "src/objects/frame-array-inl.h"
 #include "src/trap-handler/trap-handler.h"

src/s390/frames-s390.cc → src/s390/frame-constants-s390.cc

@@ -4,22 +4,21 @@
 
 #if V8_TARGET_ARCH_S390
 
-#include "src/frames.h"
 #include "src/assembler.h"
+#include "src/frame-constants.h"
 #include "src/macro-assembler.h"
 #include "src/s390/assembler-s390-inl.h"
 #include "src/s390/assembler-s390.h"
-#include "src/s390/frames-s390.h"
 #include "src/s390/macro-assembler-s390.h"
 
+#include "src/s390/frame-constants-s390.h"
+
 namespace v8 {
 namespace internal {
 
 Register JavaScriptFrame::fp_register() { return v8::internal::fp; }
 Register JavaScriptFrame::context_register() { return cp; }
-Register JavaScriptFrame::constant_pool_pointer_register() {
-  UNREACHABLE();
-}
+Register JavaScriptFrame::constant_pool_pointer_register() { UNREACHABLE(); }
 
 }  // namespace internal
 }  // namespace v8

src/s390/simulator-s390.cc

@@ -13,9 +13,9 @@
 #include "src/base/once.h"
 #include "src/codegen.h"
 #include "src/disasm.h"
+#include "src/frame-constants.h"
 #include "src/runtime/runtime-utils.h"
 #include "src/s390/constants-s390.h"
-#include "src/s390/frames-s390.h"
 #include "src/s390/simulator-s390.h"
 #if defined(USE_SIMULATOR)
 

src/v8.gyp

@@ -989,6 +989,7 @@
         'flag-definitions.h',
         'flags.cc',
         'flags.h',
+        'frame-constants.h',
         'frames-inl.h',
         'frames.cc',
         'frames.h',
@@ -1500,8 +1501,8 @@
             'arm/cpu-arm.cc',
             'arm/deoptimizer-arm.cc',
             'arm/disasm-arm.cc',
-            'arm/frames-arm.cc',
-            'arm/frames-arm.h',
+            'arm/frame-constants-arm.cc',
+            'arm/frame-constants-arm.h',
             'arm/interface-descriptors-arm.cc',
             'arm/interface-descriptors-arm.h',
             'arm/macro-assembler-arm.cc',
@@ -1541,8 +1542,8 @@
             'arm64/deoptimizer-arm64.cc',
             'arm64/disasm-arm64.cc',
             'arm64/disasm-arm64.h',
-            'arm64/frames-arm64.cc',
-            'arm64/frames-arm64.h',
+            'arm64/frame-constants-arm64.cc',
+            'arm64/frame-constants-arm64.h',
             'arm64/instructions-arm64.cc',
             'arm64/instructions-arm64.h',
             'arm64/instrument-arm64.cc',
@@ -1585,8 +1586,8 @@
             'ia32/cpu-ia32.cc',
             'ia32/deoptimizer-ia32.cc',
             'ia32/disasm-ia32.cc',
-            'ia32/frames-ia32.cc',
-            'ia32/frames-ia32.h',
+            'ia32/frame-constants-ia32.cc',
+            'ia32/frame-constants-ia32.h',
             'ia32/interface-descriptors-ia32.cc',
             'ia32/macro-assembler-ia32.cc',
             'ia32/macro-assembler-ia32.h',
@@ -1620,8 +1621,8 @@
             'mips/cpu-mips.cc',
             'mips/deoptimizer-mips.cc',
             'mips/disasm-mips.cc',
-            'mips/frames-mips.cc',
-            'mips/frames-mips.h',
+            'mips/frame-constants-mips.cc',
+            'mips/frame-constants-mips.h',
             'mips/interface-descriptors-mips.cc',
             'mips/macro-assembler-mips.cc',
             'mips/macro-assembler-mips.h',
@@ -1654,8 +1655,8 @@
             'mips64/cpu-mips64.cc',
             'mips64/deoptimizer-mips64.cc',
             'mips64/disasm-mips64.cc',
-            'mips64/frames-mips64.cc',
-            'mips64/frames-mips64.h',
+            'mips64/frame-constants-mips64.cc',
+            'mips64/frame-constants-mips64.h',
             'mips64/interface-descriptors-mips64.cc',
             'mips64/macro-assembler-mips64.cc',
             'mips64/macro-assembler-mips64.h',
@@ -1693,8 +1694,8 @@
             'x64/deoptimizer-x64.cc',
             'x64/disasm-x64.cc',
             'x64/eh-frame-x64.cc',
-            'x64/frames-x64.cc',
-            'x64/frames-x64.h',
+            'x64/frame-constants-x64.cc',
+            'x64/frame-constants-x64.h',
             'x64/interface-descriptors-x64.cc',
             'x64/macro-assembler-x64.cc',
             'x64/macro-assembler-x64.h',
@@ -1737,8 +1738,8 @@
             'ppc/cpu-ppc.cc',
             'ppc/deoptimizer-ppc.cc',
             'ppc/disasm-ppc.cc',
-            'ppc/frames-ppc.cc',
-            'ppc/frames-ppc.h',
+            'ppc/frame-constants-ppc.cc',
+            'ppc/frame-constants-ppc.h',
             'ppc/interface-descriptors-ppc.cc',
             'ppc/macro-assembler-ppc.cc',
             'ppc/macro-assembler-ppc.h',
@@ -1773,8 +1774,8 @@
             's390/cpu-s390.cc',
             's390/deoptimizer-s390.cc',
             's390/disasm-s390.cc',
-            's390/frames-s390.cc',
-            's390/frames-s390.h',
+            's390/frame-constants-s390.cc',
+            's390/frame-constants-s390.h',
             's390/interface-descriptors-s390.cc',
             's390/macro-assembler-s390.cc',
             's390/macro-assembler-s390.h',

src/x64/frames-x64.cc → src/x64/frame-constants-x64.cc

@@ -5,21 +5,18 @@
 #if V8_TARGET_ARCH_X64
 
 #include "src/assembler.h"
-#include "src/frames.h"
+#include "src/frame-constants.h"
 #include "src/x64/assembler-x64-inl.h"
 #include "src/x64/assembler-x64.h"
-#include "src/x64/frames-x64.h"
+
+#include "src/x64/frame-constants-x64.h"
 
 namespace v8 {
 namespace internal {
 
-
 Register JavaScriptFrame::fp_register() { return rbp; }
 Register JavaScriptFrame::context_register() { return rsi; }
-Register JavaScriptFrame::constant_pool_pointer_register() {
-  UNREACHABLE();
-}
-
+Register JavaScriptFrame::constant_pool_pointer_register() { UNREACHABLE(); }
 
 }  // namespace internal
 }  // namespace v8

src/x64/frames-x64.h → src/x64/frame-constants-x64.h

@@ -21,7 +21,7 @@ class EntryFrameConstants : public AllStatic {
   // We have 3 Push and 5 pushq in the JSEntryStub::GenerateBody.
   static const int kCallerFPOffset = -3 * kPointerSize + -5 * kRegisterSize;
 #endif
-  static const int kArgvOffset     = 6 * kPointerSize;
+  static const int kArgvOffset = 6 * kPointerSize;
 };
 
 class ExitFrameConstants : public TypedFrameConstants {
@@ -30,17 +30,16 @@ class ExitFrameConstants : public TypedFrameConstants {
   static const int kCodeOffset = TYPED_FRAME_PUSHED_VALUE_OFFSET(1);
   DEFINE_TYPED_FRAME_SIZES(2);
 
-  static const int kCallerFPOffset  = +0 * kPointerSize;
-  static const int kCallerPCOffset  = kFPOnStackSize;
+  static const int kCallerFPOffset = +0 * kPointerSize;
+  static const int kCallerPCOffset = kFPOnStackSize;
 
   // FP-relative displacement of the caller's SP.  It points just
   // below the saved PC.
   static const int kCallerSPDisplacement = kCallerPCOffset + kPCOnStackSize;
 
-  static const int kConstantPoolOffset   = 0;  // Not used
+  static const int kConstantPoolOffset = 0;  // Not used
 };
 
-
 class JavaScriptFrameConstants : public AllStatic {
  public:
   // FP-relative.
@@ -49,7 +48,7 @@ class JavaScriptFrameConstants : public AllStatic {
   static const int kFunctionOffset = StandardFrameConstants::kFunctionOffset;
 
   // Caller SP-relative.
-  static const int kParam0Offset   = -2 * kPointerSize;
+  static const int kParam0Offset = -2 * kPointerSize;
   static const int kReceiverOffset = -1 * kPointerSize;
 };
 

test/cctest/test-run-wasm-relocation-ia32.cc

@@ -9,7 +9,7 @@
 #include "src/debug/debug.h"
 #include "src/disasm.h"
 #include "src/disassembler.h"
-#include "src/ia32/frames-ia32.h"
+#include "src/frame-constants.h"
 #include "src/ic/ic.h"
 #include "src/macro-assembler.h"
 #include "test/cctest/cctest.h"