Simplify macro-assembler.h include dance.

R=bmeurer@chromium.org

Review URL: https://codereview.chromium.org/1306023002

Cr-Commit-Position: refs/heads/master@{#30320}
This commit is contained in:
mstarzinger 2015-08-24 00:52:05 -07:00 committed by Commit bot
parent 38d46c0372
commit edc8980115

View File

@ -5,6 +5,8 @@
#ifndef V8_MACRO_ASSEMBLER_H_ #ifndef V8_MACRO_ASSEMBLER_H_
#define V8_MACRO_ASSEMBLER_H_ #define V8_MACRO_ASSEMBLER_H_
#include "src/assembler.h"
// Helper types to make boolean flag easier to read at call-site. // Helper types to make boolean flag easier to read at call-site.
enum InvokeFlag { enum InvokeFlag {
@ -32,52 +34,41 @@ enum AllocationFlags {
}; };
// Invalid depth in prototype chain.
const int kInvalidProtoDepth = -1;
#if V8_TARGET_ARCH_IA32 #if V8_TARGET_ARCH_IA32
#include "src/assembler.h"
#include "src/ia32/assembler-ia32.h" #include "src/ia32/assembler-ia32.h"
#include "src/ia32/assembler-ia32-inl.h" #include "src/ia32/assembler-ia32-inl.h"
#include "src/ia32/macro-assembler-ia32.h" #include "src/ia32/macro-assembler-ia32.h"
#elif V8_TARGET_ARCH_X64 #elif V8_TARGET_ARCH_X64
#include "src/assembler.h"
#include "src/x64/assembler-x64.h" #include "src/x64/assembler-x64.h"
#include "src/x64/assembler-x64-inl.h" #include "src/x64/assembler-x64-inl.h"
#include "src/x64/macro-assembler-x64.h" #include "src/x64/macro-assembler-x64.h"
#elif V8_TARGET_ARCH_ARM64 #elif V8_TARGET_ARCH_ARM64
#include "src/arm64/constants-arm64.h" #include "src/arm64/assembler-arm64.h"
#include "src/assembler.h"
#include "src/arm64/assembler-arm64.h" // NOLINT
#include "src/arm64/assembler-arm64-inl.h" #include "src/arm64/assembler-arm64-inl.h"
#include "src/arm64/macro-assembler-arm64.h" // NOLINT #include "src/arm64/constants-arm64.h"
#include "src/arm64/macro-assembler-arm64.h"
#include "src/arm64/macro-assembler-arm64-inl.h" #include "src/arm64/macro-assembler-arm64-inl.h"
#elif V8_TARGET_ARCH_ARM #elif V8_TARGET_ARCH_ARM
#include "src/arm/constants-arm.h" #include "src/arm/assembler-arm.h"
#include "src/assembler.h"
#include "src/arm/assembler-arm.h" // NOLINT
#include "src/arm/assembler-arm-inl.h" #include "src/arm/assembler-arm-inl.h"
#include "src/arm/macro-assembler-arm.h" // NOLINT #include "src/arm/constants-arm.h"
#include "src/arm/macro-assembler-arm.h"
#elif V8_TARGET_ARCH_PPC #elif V8_TARGET_ARCH_PPC
#include "src/ppc/constants-ppc.h" #include "src/ppc/assembler-ppc.h"
#include "src/assembler.h" // NOLINT
#include "src/ppc/assembler-ppc.h" // NOLINT
#include "src/ppc/assembler-ppc-inl.h" #include "src/ppc/assembler-ppc-inl.h"
#include "src/ppc/constants-ppc.h"
#include "src/ppc/macro-assembler-ppc.h" #include "src/ppc/macro-assembler-ppc.h"
#elif V8_TARGET_ARCH_MIPS #elif V8_TARGET_ARCH_MIPS
#include "src/mips/constants-mips.h" #include "src/mips/assembler-mips.h"
#include "src/assembler.h" // NOLINT
#include "src/mips/assembler-mips.h" // NOLINT
#include "src/mips/assembler-mips-inl.h" #include "src/mips/assembler-mips-inl.h"
#include "src/mips/constants-mips.h"
#include "src/mips/macro-assembler-mips.h" #include "src/mips/macro-assembler-mips.h"
#elif V8_TARGET_ARCH_MIPS64 #elif V8_TARGET_ARCH_MIPS64
#include "src/mips64/constants-mips64.h" #include "src/mips64/assembler-mips64.h"
#include "src/assembler.h" // NOLINT
#include "src/mips64/assembler-mips64.h" // NOLINT
#include "src/mips64/assembler-mips64-inl.h" #include "src/mips64/assembler-mips64-inl.h"
#include "src/mips64/constants-mips64.h"
#include "src/mips64/macro-assembler-mips64.h" #include "src/mips64/macro-assembler-mips64.h"
#elif V8_TARGET_ARCH_X87 #elif V8_TARGET_ARCH_X87
#include "src/assembler.h"
#include "src/x87/assembler-x87.h" #include "src/x87/assembler-x87.h"
#include "src/x87/assembler-x87-inl.h" #include "src/x87/assembler-x87-inl.h"
#include "src/x87/macro-assembler-x87.h" #include "src/x87/macro-assembler-x87.h"