Skip to content

V
V8
Commit e9b5d785 authored by mark@chromium.org's avatar mark@chromium.org
Browse files
Options

Allow build-time selection between ia32 and x86_64 in the GYP/Xcode Mac 

Chromium build.

v8.gyp no longer sets any V8_TARGET_ARCH_* macro on the Mac. Instead, the
proper V8_TARGET_ARCH_* macro will be set by src/globals.h in the same way as
the V8_HOST_ARCH_* macro when it detects that no target macro is currently
defined. The Mac build will attempt to compile all ia32 and x86_64 .cc files.
#ifdef guards in each of these target-specific source files prevent their
compilation when the associated target is not selected. For completeness,
these #ifdef guards are also provided for the arm and mips .cc files.

BUG=706
TEST=x86_64 Mac GYP/Xcode-based Chromium build (still depends on other changes)
Review URL: http://codereview.chromium.org/2133003

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@4666 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 6046ae7b
Hide whitespace changes
Inline Side-by-side
Showing with 309 additions and 15 deletions
src/arm/assembler-arm.cc
View file @ e9b5d785
......@@ -36,6 +36,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_ARM) && defined(V8_ARM_VARIANT_ARM)
#include "arm/assembler-arm-inl.h"
#include "serialize.h"
......@@ -2257,3 +2259,5 @@ void Assembler::CheckConstPool(bool force_emit, bool require_jump) {
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_ARM && V8_ARM_VARIANT_ARM
src/arm/assembler-thumb2.cc
View file @ e9b5d785
......@@ -36,6 +36,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_ARM) && defined(V8_ARM_VARIANT_THUMB)
#include "arm/assembler-thumb2-inl.h"
#include "serialize.h"
......@@ -1876,3 +1878,5 @@ void Assembler::CheckConstPool(bool force_emit, bool require_jump) {
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_ARM && V8_ARM_VARIANT_THUMB
src/arm/builtins-arm.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_ARM)
#include "codegen-inl.h"
#include "debug.h"
#include "runtime.h"
......@@ -1311,3 +1313,5 @@ void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) {
#undef __
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_ARM
src/arm/codegen-arm.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_ARM)
#include "bootstrapper.h"
#include "codegen-inl.h"
#include "compiler.h"
......@@ -10020,3 +10022,5 @@ void StringAddStub::Generate(MacroAssembler* masm) {
#undef __
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_ARM
src/arm/constants-arm.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_ARM)
#include "constants-arm.h"
......@@ -128,3 +130,5 @@ int Registers::Number(const char* name) {
} } // namespace assembler::arm
#endif // V8_TARGET_ARCH_ARM
src/arm/cpu-arm.cc
View file @ e9b5d785
......@@ -32,6 +32,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_ARM)
#include "cpu.h"
#include "macro-assembler.h"
......@@ -136,3 +138,5 @@ void CPU::DebugBreak() {
}
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_ARM
src/arm/debug-arm.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_ARM)
#include "codegen-inl.h"
#include "debug.h"
......@@ -237,3 +239,5 @@ const int Debug::kFrameDropperFrameSize = -1;
#endif // ENABLE_DEBUGGER_SUPPORT
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_ARM
src/arm/disasm-arm.cc
View file @ e9b5d785
......@@ -56,6 +56,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_ARM)
#include "constants-arm.h"
#include "disasm.h"
#include "macro-assembler.h"
......@@ -1356,3 +1358,5 @@ void Disassembler::Disassemble(FILE* f, byte* begin, byte* end) {
} // namespace disasm
#endif // V8_TARGET_ARCH_ARM
src/arm/fast-codegen-arm.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_ARM)
#include "codegen-inl.h"
#include "fast-codegen.h"
#include "scopes.h"
......@@ -236,3 +238,5 @@ void FastCodeGenerator::Generate(CompilationInfo* compilation_info) {
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_ARM
src/arm/frames-arm.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_ARM)
#include "frames-inl.h"
#ifdef V8_ARM_VARIANT_THUMB
#include "arm/assembler-thumb2-inl.h"
......@@ -121,3 +123,5 @@ Address InternalFrame::GetCallerStackPointer() const {
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_ARM
src/arm/full-codegen-arm.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_ARM)
#include "codegen-inl.h"
#include "compiler.h"
#include "debug.h"
......@@ -1877,3 +1879,5 @@ void FullCodeGenerator::ExitFinallyBlock() {
#undef __
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_ARM
src/arm/ic-arm.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_ARM)
#include "assembler-arm.h"
#include "codegen.h"
#include "codegen-inl.h"
......@@ -1841,3 +1843,5 @@ void StoreIC::GenerateArrayLength(MacroAssembler* masm) {
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_ARM
src/arm/jump-target-arm.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_ARM)
#include "codegen-inl.h"
#include "jump-target-inl.h"
#include "register-allocator-inl.h"
......@@ -136,3 +138,5 @@ void JumpTarget::DoBind() {
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_ARM
src/arm/macro-assembler-arm.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_ARM)
#include "bootstrapper.h"
#include "codegen-inl.h"
#include "debug.h"
......@@ -1725,3 +1727,5 @@ void CodePatcher::Emit(Address addr) {
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_ARM
src/arm/regexp-macro-assembler-arm.cc
View file @ e9b5d785
......@@ -26,6 +26,9 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "v8.h"
#if defined(V8_TARGET_ARCH_ARM)
#include "unicode.h"
#include "log.h"
#include "ast.h"
......@@ -1255,3 +1258,5 @@ void RegExpCEntryStub::Generate(MacroAssembler* masm_) {
#endif // V8_INTERPRETED_REGEXP
}} // namespace v8::internal
#endif // V8_TARGET_ARCH_ARM
src/arm/register-allocator-arm.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_ARM)
#include "codegen-inl.h"
#include "register-allocator-inl.h"
......@@ -57,3 +59,5 @@ Result RegisterAllocator::AllocateByteRegisterWithoutSpilling() {
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_ARM
src/arm/simulator-arm.cc
View file @ e9b5d785
......@@ -29,6 +29,8 @@
#include <cstdarg>
#include "v8.h"
#if defined(V8_TARGET_ARCH_ARM)
#include "disasm.h"
#include "assembler.h"
#include "arm/constants-arm.h"
......@@ -2731,3 +2733,5 @@ uintptr_t Simulator::PopAddress() {
} } // namespace assembler::arm
#endif // __arm__
#endif // V8_TARGET_ARCH_ARM
src/arm/stub-cache-arm.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_ARM)
#include "ic-inl.h"
#include "codegen-inl.h"
#include "stub-cache.h"
......@@ -2153,3 +2155,5 @@ Object* ConstructStubCompiler::CompileConstructStub(
#undef __
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_ARM
src/arm/virtual-frame-arm.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_ARM)
#include "codegen-inl.h"
#include "register-allocator-inl.h"
#include "scopes.h"
......@@ -749,3 +751,5 @@ void VirtualFrame::SpillAll() {
#undef __
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_ARM
src/globals.h
View file @ e9b5d785
......@@ -59,6 +59,24 @@ namespace internal {
#error Host architecture was not detected as supported by v8
#endif
// Target architecture detection. This may be set externally. If not, detect
// in the same way as the host architecture, that is, target the native
// environment as presented by the compiler.
#if !defined(V8_TARGET_ARCH_X64) && !defined(V8_TARGET_ARCH_IA32) && \
!defined(V8_TARGET_ARCH_ARM) && !defined(V8_TARGET_ARCH_MIPS)
#if defined(_M_X64) || defined(__x86_64__)
#define V8_TARGET_ARCH_X64 1
#elif defined(_M_IX86) || defined(__i386__)
#define V8_TARGET_ARCH_IA32 1
#elif defined(__ARMEL__)
#define V8_TARGET_ARCH_ARM 1
#elif defined(_MIPS_ARCH_MIPS32R2)
#define V8_TARGET_ARCH_MIPS 1
#else
#error Target architecture was not detected as supported by v8
#endif
#endif
// Check for supported combinations of host and target architectures.
#if defined(V8_TARGET_ARCH_IA32) && !defined(V8_HOST_ARCH_IA32)
#error Target architecture ia32 is only supported on ia32 host
......
src/ia32/assembler-ia32.cc
View file @ e9b5d785
......@@ -36,6 +36,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_IA32)
#include "disassembler.h"
#include "macro-assembler.h"
#include "serialize.h"
......@@ -2535,3 +2537,5 @@ void LogGeneratedCodeCoverage(const char* file_line) {
#endif
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_IA32
src/ia32/builtins-ia32.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_IA32)
#include "codegen-inl.h"
namespace v8 {
......@@ -1256,3 +1258,5 @@ void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) {
#undef __
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_IA32
src/ia32/codegen-ia32.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_IA32)
#include "bootstrapper.h"
#include "codegen-inl.h"
#include "compiler.h"
......@@ -13291,3 +13293,5 @@ void StringCompareStub::Generate(MacroAssembler* masm) {
#undef __
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_IA32
src/ia32/cpu-ia32.cc
View file @ e9b5d785
......@@ -33,6 +33,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_IA32)
#include "cpu.h"
#include "macro-assembler.h"
......@@ -77,3 +79,5 @@ void CPU::DebugBreak() {
}
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_IA32
src/ia32/debug-ia32.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_IA32)
#include "codegen-inl.h"
#include "debug.h"
......@@ -261,3 +263,5 @@ const int Debug::kFrameDropperFrameSize = 5;
#endif // ENABLE_DEBUGGER_SUPPORT
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_IA32
src/ia32/disasm-ia32.cc
View file @ e9b5d785
......@@ -30,6 +30,9 @@
#include <stdarg.h>
#include "v8.h"
#if defined(V8_TARGET_ARCH_IA32)
#include "disasm.h"
namespace disasm {
......@@ -1439,3 +1442,5 @@ int Disassembler::ConstantPoolSizeAt(byte* instruction) { return -1; }
} // namespace disasm
#endif // V8_TARGET_ARCH_IA32
src/ia32/fast-codegen-ia32.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_IA32)
#include "codegen-inl.h"
#include "fast-codegen.h"
#include "data-flow.h"
......@@ -948,3 +950,5 @@ void FastCodeGenerator::VisitThisFunction(ThisFunction* expr) {
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_IA32
src/ia32/frames-ia32.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_IA32)
#include "frames-inl.h"
namespace v8 {
......@@ -109,3 +111,5 @@ Address InternalFrame::GetCallerStackPointer() const {
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_IA32
src/ia32/full-codegen-ia32.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_IA32)
#include "codegen-inl.h"
#include "compiler.h"
#include "debug.h"
......@@ -2012,3 +2014,5 @@ void FullCodeGenerator::ExitFinallyBlock() {
#undef __
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_IA32
src/ia32/ic-ia32.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_IA32)
#include "codegen-inl.h"
#include "ic-inl.h"
#include "runtime.h"
......@@ -1643,3 +1645,5 @@ void KeyedStoreIC::GenerateMiss(MacroAssembler* masm) {
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_IA32
src/ia32/jump-target-ia32.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_IA32)
#include "codegen-inl.h"
#include "jump-target-inl.h"
#include "register-allocator-inl.h"
......@@ -431,3 +433,5 @@ void BreakTarget::Bind(Result* arg) {
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_IA32
src/ia32/macro-assembler-ia32.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_IA32)
#include "bootstrapper.h"
#include "codegen-inl.h"
#include "debug.h"
......@@ -1706,3 +1708,5 @@ CodePatcher::~CodePatcher() {
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_IA32
src/ia32/regexp-macro-assembler-ia32.cc
View file @ e9b5d785
......@@ -26,6 +26,9 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "v8.h"
#if defined(V8_TARGET_ARCH_IA32)
#include "unicode.h"
#include "log.h"
#include "ast.h"
......@@ -1241,3 +1244,5 @@ void RegExpMacroAssemblerIA32::LoadCurrentCharacterUnchecked(int cp_offset,
#endif // V8_INTERPRETED_REGEXP
}} // namespace v8::internal
#endif // V8_TARGET_ARCH_IA32
src/ia32/register-allocator-ia32.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_IA32)
#include "codegen-inl.h"
#include "register-allocator-inl.h"
#include "virtual-frame-inl.h"
......@@ -151,3 +153,5 @@ Result RegisterAllocator::AllocateByteRegisterWithoutSpilling() {
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_IA32
src/ia32/stub-cache-ia32.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_IA32)
#include "ic-inl.h"
#include "codegen-inl.h"
#include "stub-cache.h"
......@@ -2387,3 +2389,5 @@ Object* ConstructStubCompiler::CompileConstructStub(
#undef __
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_IA32
src/ia32/virtual-frame-ia32.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_IA32)
#include "codegen-inl.h"
#include "register-allocator-inl.h"
#include "scopes.h"
......@@ -1310,3 +1312,5 @@ void VirtualFrame::Push(Expression* expr) {
#undef __
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_IA32
src/mips/assembler-mips.cc
View file @ e9b5d785
......@@ -34,6 +34,9 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_MIPS)
#include "mips/assembler-mips-inl.h"
#include "serialize.h"
......@@ -1206,3 +1209,4 @@ void Assembler::set_target_address_at(Address pc, Address target) {
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_MIPS
src/mips/builtins-mips.cc
View file @ e9b5d785
......@@ -29,6 +29,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_MIPS)
#include "codegen-inl.h"
#include "debug.h"
#include "runtime.h"
......@@ -200,3 +202,4 @@ void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) {
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_MIPS
src/mips/codegen-mips.cc
View file @ e9b5d785
......@@ -28,6 +28,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_MIPS)
#include "bootstrapper.h"
#include "codegen-inl.h"
#include "compiler.h"
......@@ -1426,3 +1428,5 @@ int CompareStub::MinorKey() {
#undef __
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_MIPS
src/mips/constants-mips.cc
View file @ e9b5d785
......@@ -26,6 +26,9 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "v8.h"
#if defined(V8_TARGET_ARCH_MIPS)
#include "constants-mips.h"
namespace assembler {
......@@ -321,3 +324,5 @@ Instruction::Type Instruction::InstructionType() const {
}
} } // namespace assembler::mips
#endif // V8_TARGET_ARCH_MIPS
src/mips/cpu-mips.cc
View file @ e9b5d785
......@@ -35,6 +35,9 @@
#endif // #ifdef __mips
#include "v8.h"
#if defined(V8_TARGET_ARCH_MIPS)
#include "cpu.h"
namespace v8 {
......@@ -67,3 +70,4 @@ void CPU::DebugBreak() {
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_MIPS
src/mips/debug-mips.cc
View file @ e9b5d785
......@@ -29,6 +29,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_MIPS)
#include "codegen-inl.h"
#include "debug.h"
......@@ -126,3 +128,4 @@ const int Debug::kFrameDropperFrameSize = -1;
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_MIPS
src/mips/disasm-mips.cc
View file @ e9b5d785
......@@ -57,6 +57,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_MIPS)
#include "constants-mips.h"
#include "disasm.h"
#include "macro-assembler.h"
......@@ -782,3 +784,4 @@ void Disassembler::Disassemble(FILE* f, byte_* begin, byte_* end) {
} // namespace disasm
#endif // V8_TARGET_ARCH_MIPS
src/mips/fast-codegen-mips.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_MIPS)
#include "codegen-inl.h"
#include "fast-codegen.h"
......@@ -72,3 +74,4 @@ void FastCodeGenerator::EmitBitOr() {
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_MIPS
src/mips/frames-mips.cc
View file @ e9b5d785
......@@ -28,6 +28,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_MIPS)
#include "frames-inl.h"
#include "mips/assembler-mips-inl.h"
......@@ -97,3 +99,4 @@ Address InternalFrame::GetCallerStackPointer() const {
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_MIPS
src/mips/full-codegen-mips.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_MIPS)
#include "codegen-inl.h"
#include "compiler.h"
#include "debug.h"
......@@ -271,3 +273,5 @@ void FullCodeGenerator::ExitFinallyBlock() {
#undef __
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_MIPS
src/mips/ic-mips.cc
View file @ e9b5d785
......@@ -29,6 +29,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_MIPS)
#include "codegen-inl.h"
#include "ic-inl.h"
#include "runtime.h"
......@@ -215,3 +217,4 @@ void StoreIC::GenerateArrayLength(MacroAssembler* masm) {
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_MIPS
src/mips/jump-target-mips.cc
View file @ e9b5d785
......@@ -28,6 +28,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_MIPS)
#include "codegen-inl.h"
#include "jump-target-inl.h"
#include "register-allocator-inl.h"
......@@ -170,3 +172,4 @@ void BreakTarget::Bind(Result* arg) {
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_MIPS
src/mips/macro-assembler-mips.cc
View file @ e9b5d785
......@@ -29,6 +29,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_MIPS)
#include "bootstrapper.h"
#include "codegen-inl.h"
#include "debug.h"
......@@ -1321,3 +1323,4 @@ void MacroAssembler::AlignStack(int offset) {
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_MIPS
src/mips/register-allocator-mips.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_MIPS)
#include "codegen-inl.h"
#include "register-allocator-inl.h"
......@@ -58,3 +60,4 @@ Result RegisterAllocator::AllocateByteRegisterWithoutSpilling() {
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_MIPS
src/mips/simulator-mips.cc
View file @ e9b5d785
......@@ -29,6 +29,8 @@
#include <cstdarg>
#include "v8.h"
#if defined(V8_TARGET_ARCH_MIPS)
#include "disasm.h"
#include "assembler.h"
#include "globals.h" // Need the BitCast
......@@ -1646,3 +1648,4 @@ uintptr_t Simulator::PopAddress() {
#endif // __mips
#endif // V8_TARGET_ARCH_MIPS
src/mips/stub-cache-mips.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_MIPS)
#include "ic-inl.h"
#include "codegen-inl.h"
#include "stub-cache.h"
......@@ -398,3 +400,4 @@ Object* ConstructStubCompiler::CompileConstructStub(
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_MIPS
src/mips/virtual-frame-mips.cc
View file @ e9b5d785
......@@ -29,6 +29,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_MIPS)
#include "codegen-inl.h"
#include "register-allocator-inl.h"
#include "scopes.h"
......@@ -314,3 +316,4 @@ void VirtualFrame::EmitArgumentSlots(RegList reglist) {
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_MIPS
src/x64/assembler-x64.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_X64)
#include "macro-assembler.h"
#include "serialize.h"
......@@ -2740,3 +2742,5 @@ const int RelocInfo::kApplyMask = RelocInfo::kCodeTargetMask |
1 << RelocInfo::JS_RETURN;
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_X64
src/x64/builtins-x64.cc
View file @ e9b5d785
......@@ -26,6 +26,9 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "v8.h"
#if defined(V8_TARGET_ARCH_X64)
#include "codegen-inl.h"
#include "macro-assembler.h"
......@@ -1296,3 +1299,5 @@ void Builtins::Generate_JSConstructEntryTrampoline(MacroAssembler* masm) {
}
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_X64
src/x64/codegen-x64.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_X64)
#include "bootstrapper.h"
#include "codegen-inl.h"
#include "compiler.h"
......@@ -11589,3 +11591,5 @@ ModuloFunction CreateModuloFunction() {
#undef __
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_X64
src/x64/cpu-x64.cc
View file @ e9b5d785
......@@ -33,6 +33,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_X64)
#include "cpu.h"
#include "macro-assembler.h"
......@@ -77,3 +79,5 @@ void CPU::DebugBreak() {
}
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_X64
src/x64/debug-x64.cc
View file @ e9b5d785
......@@ -28,6 +28,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_X64)
#include "codegen-inl.h"
#include "debug.h"
......@@ -216,3 +218,5 @@ void BreakLocationIterator::SetDebugBreakAtReturn() {
#endif // ENABLE_DEBUGGER_SUPPORT
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_X64
src/x64/disasm-x64.cc
View file @ e9b5d785
......@@ -30,6 +30,9 @@
#include <stdarg.h>
#include "v8.h"
#if defined(V8_TARGET_ARCH_X64)
#include "disasm.h"
namespace disasm {
......@@ -1671,3 +1674,5 @@ void Disassembler::Disassemble(FILE* f, byte* begin, byte* end) {
}
} // namespace disasm
#endif // V8_TARGET_ARCH_X64
src/x64/fast-codegen-x64.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_X64)
#include "codegen-inl.h"
#include "fast-codegen.h"
#include "scopes.h"
......@@ -244,3 +246,5 @@ void FastCodeGenerator::Generate(CompilationInfo* compilation_info) {
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_X64
src/x64/frames-x64.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_X64)
#include "frames-inl.h"
namespace v8 {
......@@ -107,3 +109,5 @@ byte* ArgumentsAdaptorFrame::GetCallerStackPointer() const {
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_X64
src/x64/full-codegen-x64.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_X64)
#include "codegen-inl.h"
#include "compiler.h"
#include "debug.h"
......@@ -1991,3 +1993,5 @@ void FullCodeGenerator::ExitFinallyBlock() {
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_X64
src/x64/ic-x64.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_X64)
#include "codegen-inl.h"
#include "ic-inl.h"
#include "runtime.h"
......@@ -1619,3 +1621,5 @@ void StoreIC::GenerateArrayLength(MacroAssembler* masm) {
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_X64
src/x64/jump-target-x64.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_X64)
#include "codegen-inl.h"
#include "jump-target-inl.h"
#include "register-allocator-inl.h"
......@@ -431,3 +433,5 @@ void BreakTarget::Bind(Result* arg) {
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_X64
src/x64/macro-assembler-x64.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_X64)
#include "bootstrapper.h"
#include "codegen-inl.h"
#include "assembler-x64.h"
......@@ -2766,3 +2768,5 @@ CodePatcher::~CodePatcher() {
}
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_X64
src/x64/regexp-macro-assembler-x64.cc
View file @ e9b5d785
......@@ -26,6 +26,9 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "v8.h"
#if defined(V8_TARGET_ARCH_X64)
#include "serialize.h"
#include "unicode.h"
#include "log.h"
......@@ -1368,3 +1371,5 @@ void RegExpMacroAssemblerX64::LoadCurrentCharacterUnchecked(int cp_offset,
#endif // V8_INTERPRETED_REGEXP
}} // namespace v8::internal
#endif // V8_TARGET_ARCH_X64
src/x64/register-allocator-x64.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_X64)
#include "codegen-inl.h"
#include "register-allocator-inl.h"
#include "virtual-frame-inl.h"
......@@ -85,3 +87,5 @@ Result RegisterAllocator::AllocateByteRegisterWithoutSpilling() {
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_X64
src/x64/stub-cache-x64.cc
View file @ e9b5d785
......@@ -28,6 +28,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_X64)
#include "ic-inl.h"
#include "codegen-inl.h"
#include "stub-cache.h"
......@@ -2367,3 +2369,5 @@ Object* ConstructStubCompiler::CompileConstructStub(
#undef __
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_X64
src/x64/virtual-frame-x64.cc
View file @ e9b5d785
......@@ -27,6 +27,8 @@
#include "v8.h"
#if defined(V8_TARGET_ARCH_X64)
#include "codegen-inl.h"
#include "register-allocator-inl.h"
#include "scopes.h"
......@@ -1163,3 +1165,5 @@ void VirtualFrame::PushTryHandler(HandlerType type) {
#undef __
} } // namespace v8::internal
#endif // V8_TARGET_ARCH_X64
tools/gyp/v8.gyp
View file @ e9b5d785
......@@ -39,19 +39,28 @@
'ENABLE_VMSTATE_TRACKING',
],
'conditions': [
['v8_target_arch=="arm"', {
'defines': [
'V8_TARGET_ARCH_ARM',
],
}],
['v8_target_arch=="ia32"', {
'defines': [
'V8_TARGET_ARCH_IA32',
],
}],
['v8_target_arch=="x64"', {
'defines': [
'V8_TARGET_ARCH_X64',
['OS!="mac"', {
# TODO(mark): The OS!="mac" conditional is temporary. It can be
# removed once the Mac Chromium build stops setting target_arch to
# ia32 and instead sets it to mac. Other checks in this file for
# OS=="mac" can be removed at that time as well. This can be cleaned
# up once http://crbug.com/44205 is fixed.
'conditions': [
['v8_target_arch=="arm"', {
'defines': [
'V8_TARGET_ARCH_ARM',
],
}],
['v8_target_arch=="ia32"', {
'defines': [
'V8_TARGET_ARCH_IA32',
],
}],
['v8_target_arch=="x64"', {
'defines': [
'V8_TARGET_ARCH_X64',
],
}],
],
}],
],
......@@ -477,7 +486,7 @@
}]
]
}],
['v8_target_arch=="ia32"', {
['v8_target_arch=="ia32" or v8_target_arch=="mac" or OS=="mac"', {
'include_dirs+': [
'../../src/ia32',
],
......@@ -513,7 +522,7 @@
'../../src/ia32/virtual-frame-ia32.h',
],
}],
['v8_target_arch=="x64"', {
['v8_target_arch=="x64" or v8_target_arch=="mac" or OS=="mac"', {
'include_dirs+': [
'../../src/x64',
],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment