Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (164268 => 164269)
--- trunk/Source/_javascript_Core/ChangeLog 2014-02-18 04:10:04 UTC (rev 164268)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-02-18 04:20:13 UTC (rev 164269)
@@ -1,3 +1,22 @@
+2014-02-17 Filip Pizlo <[email protected]>
+
+ More ARM FTL glue
+ https://bugs.webkit.org/show_bug.cgi?id=128948
+
+ Reviewed by Sam Weinig.
+
+ * Configurations/Base.xcconfig: Allow for an header search directory for LLVM's generated files.
+ * Configurations/LLVMForJSC.xcconfig: Link the right things for ARM.
+ * assembler/ARM64Assembler.h: Builds fix.
+ (JSC::ARM64Assembler::fillNops):
+ * disassembler/LLVMDisassembler.cpp: Use the right target triples.
+ (JSC::tryToDisassembleWithLLVM):
+ * ftl/FTLCompile.cpp:
+ (JSC::FTL::fixFunctionBasedOnStackMaps): Build fix.
+ * jit/GPRInfo.h: Builds fix.
+ * llvm/library/LLVMExports.cpp: Link the right things.
+ (initializeAndGetJSCLLVMAPI):
+
2014-02-17 Anders Carlsson <[email protected]>
Remove ENABLE_GLOBAL_FASTMALLOC_NEW
Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (164268 => 164269)
--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2014-02-18 04:10:04 UTC (rev 164268)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2014-02-18 04:20:13 UTC (rev 164269)
@@ -78,7 +78,7 @@
LINKER_DISPLAYS_MANGLED_NAMES = YES;
PREBINDING = NO;
WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
-HEADER_SEARCH_PATHS = . icu "${BUILT_PRODUCTS_DIR}/usr/local/LLVMForJavaScriptCore/include" /usr/local/LLVMForJavaScriptCore/include "${BUILT_PRODUCTS_DIR}/usr/local/include" $(HEADER_SEARCH_PATHS);
+HEADER_SEARCH_PATHS = . icu "${BUILT_PRODUCTS_DIR}/usr/local/LLVMForJavaScriptCore/include" "${BUILT_PRODUCTS_DIR}/ExtraIncludesForLocalLLVMBuild" /usr/local/LLVMForJavaScriptCore/include "${BUILT_PRODUCTS_DIR}/usr/local/include" $(HEADER_SEARCH_PATHS);
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
Modified: trunk/Source/_javascript_Core/Configurations/LLVMForJSC.xcconfig (164268 => 164269)
--- trunk/Source/_javascript_Core/Configurations/LLVMForJSC.xcconfig 2014-02-18 04:10:04 UTC (rev 164268)
+++ trunk/Source/_javascript_Core/Configurations/LLVMForJSC.xcconfig 2014-02-18 04:20:13 UTC (rev 164269)
@@ -27,13 +27,16 @@
// Prevent C++ standard library operator new, delete and their related exception types from being exported as weak symbols.
OTHER_LDFLAGS_HIDE_SYMBOLS = -Wl,-unexported_symbol -Wl,__ZTISt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTISt9exception -Wl,-unexported_symbol -Wl,__ZTSSt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTSSt9exception -Wl,-unexported_symbol -Wl,__ZdlPvS_ -Wl,-unexported_symbol -Wl,__ZnwmPv -Wl,-all_load;
+LLVM_LIBS_iphoneos = -lLLVMTableGen -lLLVMDebugInfo -lLLVMOption -lLLVMARM64Disassembler -lLLVMARM64AsmParser -lLLVMARM64CodeGen -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMARM64Desc -lLLVMARM64Info -lLLVMARM64AsmPrinter -lLLVMIRReader -lLLVMAsmParser -lLLVMMCDisassembler -lLLVMMCParser -lLLVMInstrumentation -lLLVMBitReader -lLLVMInterpreter -lLLVMipo -lLLVMVectorize -lLLVMLinker -lLLVMBitWriter -lLLVMMCJIT -lLLVMJIT -lLLVMCodeGen -lLLVMObjCARCOpts -lLLVMScalarOpts -lLLVMInstCombine -lLLVMTransformUtils -lLLVMipa -lLLVMAnalysis -lLLVMRuntimeDyld -lLLVMExecutionEngine -lLLVMTarget -lLLVMMC -lLLVMObject -lLLVMCore -lLLVMSupport;
+LLVM_LIBS_macosx = -lLLVMTableGen -lLLVMDebugInfo -lLLVMOption -lLLVMX86Disassembler -lLLVMX86AsmParser -lLLVMX86CodeGen -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMX86Desc -lLLVMX86Info -lLLVMX86AsmPrinter -lLLVMX86Utils -lLLVMIRReader -lLLVMAsmParser -lLLVMMCDisassembler -lLLVMMCParser -lLLVMInstrumentation -lLLVMBitReader -lLLVMInterpreter -lLLVMipo -lLLVMVectorize -lLLVMLinker -lLLVMBitWriter -lLLVMMCJIT -lLLVMJIT -lLLVMCodeGen -lLLVMObjCARCOpts -lLLVMScalarOpts -lLLVMInstCombine -lLLVMTransformUtils -lLLVMipa -lLLVMAnalysis -lLLVMRuntimeDyld -lLLVMExecutionEngine -lLLVMTarget -lLLVMMC -lLLVMObject -lLLVMCore -lLLVMSupport;
+
OTHER_LDFLAGS_LLVM = $(OTHER_LDFLAGS_LLVM_$(ENABLE_FTL_JIT));
OTHER_LDFLAGS_LLVM_ = ;
-OTHER_LDFLAGS_LLVM_ENABLE_FTL_JIT = -lpthread -lm -L/usr/local/LLVMForJavaScriptCore/lib -lLLVMTableGen -lLLVMDebugInfo -lLLVMOption -lLLVMX86Disassembler -lLLVMX86AsmParser -lLLVMX86CodeGen -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMX86Desc -lLLVMX86Info -lLLVMX86AsmPrinter -lLLVMX86Utils -lLLVMIRReader -lLLVMAsmParser -lLLVMMCDisassembler -lLLVMMCParser -lLLVMInstrumentation -lLLVMBitReader -lLLVMInterpreter -lLLVMipo -lLLVMVectorize -lLLVMLinker -lLLVMBitWriter -lLLVMMCJIT -lLLVMJIT -lLLVMCodeGen -lLLVMObjCARCOpts -lLLVMScalarOpts -lLLVMInstCombine -lLLVMTransformUtils -lLLVMipa -lLLVMAnalysis -lLLVMRuntimeDyld -lLLVMExecutionEngine -lLLVMTarget -lLLVMMC -lLLVMObject -lLLVMCore -lLLVMSupport;
+OTHER_LDFLAGS_LLVM_ENABLE_FTL_JIT = -lpthread -lm -L/usr/local/LLVMForJavaScriptCore/lib $(LLVM_LIBS_$(PLATFORM_NAME));
OTHER_LDFLAGS_BASE = -lobjc -Wl,-Y,3 $(OTHER_LDFLAGS_HIDE_SYMBOLS);
OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
-OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_BASE);
+OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_BASE) $(OTHER_LDFLAGS_LLVM);
OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) $(OTHER_LDFLAGS_LLVM)
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
Modified: trunk/Source/_javascript_Core/assembler/ARM64Assembler.h (164268 => 164269)
--- trunk/Source/_javascript_Core/assembler/ARM64Assembler.h 2014-02-18 04:10:04 UTC (rev 164268)
+++ trunk/Source/_javascript_Core/assembler/ARM64Assembler.h 2014-02-18 04:20:13 UTC (rev 164269)
@@ -1669,6 +1669,14 @@
insn(nopPseudo());
}
+ static void fillNops(void* base, size_t size)
+ {
+ RELEASE_ASSERT(!(size % sizeof(int32_t)));
+ size_t n = size / sizeof(int32_t);
+ for (int32_t* ptr = static_cast<int32_t*>(base); n--;)
+ *ptr++ = nopPseudo();
+ }
+
ALWAYS_INLINE void dmbSY()
{
insn(0xd5033fbf);
Modified: trunk/Source/_javascript_Core/disassembler/LLVMDisassembler.cpp (164268 => 164269)
--- trunk/Source/_javascript_Core/disassembler/LLVMDisassembler.cpp 2014-02-18 04:10:04 UTC (rev 164268)
+++ trunk/Source/_javascript_Core/disassembler/LLVMDisassembler.cpp 2014-02-18 04:20:13 UTC (rev 164269)
@@ -87,6 +87,8 @@
triple = "x86_64-apple-darwin";
#elif CPU(X86)
triple = "x86-apple-darwin";
+#elif CPU(ARM64)
+ triple = "arm64-apple-darwin";
#else
#error "LLVM disassembler currently not supported on this CPU."
#endif
Modified: trunk/Source/_javascript_Core/ftl/FTLCompile.cpp (164268 => 164269)
--- trunk/Source/_javascript_Core/ftl/FTLCompile.cpp 2014-02-18 04:10:04 UTC (rev 164268)
+++ trunk/Source/_javascript_Core/ftl/FTLCompile.cpp 2014-02-18 04:20:13 UTC (rev 164269)
@@ -344,8 +344,8 @@
JITPutByIdGenerator gen(
codeBlock, putById.codeOrigin(), usedRegisters, JSValueRegs(base),
- JSValueRegs(value), MacroAssembler::scratchRegister, false, putById.ecmaMode(),
- putById.putKind());
+ JSValueRegs(value), GPRInfo::patchpointScratchRegister, false,
+ putById.ecmaMode(), putById.putKind());
MacroAssembler::Label begin = slowPathJIT.label();
Modified: trunk/Source/_javascript_Core/jit/GPRInfo.h (164268 => 164269)
--- trunk/Source/_javascript_Core/jit/GPRInfo.h 2014-02-18 04:10:04 UTC (rev 164268)
+++ trunk/Source/_javascript_Core/jit/GPRInfo.h 2014-02-18 04:20:13 UTC (rev 164269)
@@ -399,6 +399,7 @@
static const GPRReg returnValueGPR = X86Registers::eax; // regT0
static const GPRReg returnValueGPR2 = X86Registers::edx; // regT1
static const GPRReg nonPreservedNonReturnGPR = X86Registers::esi;
+ static const GPRReg patchpointScratchRegister = MacroAssembler::scratchRegister;
static GPRReg toRegister(unsigned index)
{
@@ -573,6 +574,7 @@
static const GPRReg returnValueGPR = ARM64Registers::x0; // regT0
static const GPRReg returnValueGPR2 = ARM64Registers::x1; // regT1
static const GPRReg nonPreservedNonReturnGPR = ARM64Registers::x2;
+ static const GPRReg patchpointScratchRegister = ARM64Registers::ip0;
// GPRReg mapping is direct, the machine regsiter numbers can
// be used directly as indices into the GPR RegisterBank.
Modified: trunk/Source/_javascript_Core/llvm/library/LLVMExports.cpp (164268 => 164269)
--- trunk/Source/_javascript_Core/llvm/library/LLVMExports.cpp 2014-02-18 04:10:04 UTC (rev 164268)
+++ trunk/Source/_javascript_Core/llvm/library/LLVMExports.cpp 2014-02-18 04:20:13 UTC (rev 164269)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -48,8 +48,15 @@
LLVMLinkInMCJIT();
LLVMInitializeNativeTarget();
+#if CPU(X86_64)
LLVMInitializeX86AsmPrinter();
LLVMInitializeX86Disassembler();
+#elif CPU(ARM64)
+ LLVMInitializeARM64AsmPrinter();
+ LLVMInitializeARM64Disassembler();
+#else
+ UNREACHABLE_FOR_PLATFORM();
+#endif
JSC::LLVMAPI* result = new JSC::LLVMAPI;
Modified: trunk/Source/WTF/ChangeLog (164268 => 164269)
--- trunk/Source/WTF/ChangeLog 2014-02-18 04:10:04 UTC (rev 164268)
+++ trunk/Source/WTF/ChangeLog 2014-02-18 04:20:13 UTC (rev 164269)
@@ -1,3 +1,12 @@
+2014-02-17 Filip Pizlo <[email protected]>
+
+ More ARM FTL glue
+ https://bugs.webkit.org/show_bug.cgi?id=128948
+
+ Reviewed by Sam Weinig.
+
+ * wtf/Platform.h:
+
2014-02-17 Anders Carlsson <[email protected]>
Remove ENABLE_GLOBAL_FASTMALLOC_NEW
Modified: trunk/Source/WTF/wtf/Platform.h (164268 => 164269)
--- trunk/Source/WTF/wtf/Platform.h 2014-02-18 04:10:04 UTC (rev 164268)
+++ trunk/Source/WTF/wtf/Platform.h 2014-02-18 04:20:13 UTC (rev 164269)
@@ -646,7 +646,7 @@
#endif
/* Do we have LLVM? */
-#if !defined(HAVE_LLVM) && OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) && ENABLE(FTL_JIT) && CPU(X86_64)
+#if !defined(HAVE_LLVM) && OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) && ENABLE(FTL_JIT) && (CPU(X86_64) || CPU(ARM64))
#define HAVE_LLVM 1
#endif
@@ -662,7 +662,7 @@
/* If possible, try to enable the LLVM disassembler. This is optional and we can
fall back on UDis86 if necessary. */
-#if !defined(WTF_USE_LLVM_DISASSEMBLER) && HAVE(LLVM) && (CPU(X86_64) || CPU(X86))
+#if !defined(WTF_USE_LLVM_DISASSEMBLER) && HAVE(LLVM) && (CPU(X86_64) || CPU(X86) || CPU(ARM64))
#define WTF_USE_LLVM_DISASSEMBLER 1
#endif
Modified: trunk/Tools/ChangeLog (164268 => 164269)
--- trunk/Tools/ChangeLog 2014-02-18 04:10:04 UTC (rev 164268)
+++ trunk/Tools/ChangeLog 2014-02-18 04:20:13 UTC (rev 164269)
@@ -1,3 +1,13 @@
+2014-02-17 Filip Pizlo <[email protected]>
+
+ More ARM FTL glue
+ https://bugs.webkit.org/show_bug.cgi?id=128948
+
+ Reviewed by Sam Weinig.
+
+ * Scripts/configure-llvm: Removed. This isn't really practical now that we require a separate build directory.
+ * Scripts/copy-webkitlibraries-to-product-directory: Switch to using a separate build directory, and for setting a PATH before running LLVM's make.
+
2014-02-17 Brent Fulgham <[email protected]>
[Win] There's another Windows SDK. Make sure we recognize it.
Deleted: trunk/Tools/Scripts/configure-llvm (164268 => 164269)
--- trunk/Tools/Scripts/configure-llvm 2014-02-18 04:10:04 UTC (rev 164268)
+++ trunk/Tools/Scripts/configure-llvm 2014-02-18 04:20:13 UTC (rev 164269)
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2013 Apple Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-set -e
-set -x
-
-if test "x$1" != "x"
-then
- cd $1
-fi
-
-# Configure LLVM for a Release+Asserts build that only includes the x86_64 backend, uses
-# libcpp (because that's what WebKit uses), and doesn't depend on either zlib or curses.
-# In the future it will be appropriate to parameterize what backends should be built (we
-# only want to build a backend for our current target) and to add more flags to remove
-# dependencies and features.
-
-./configure --enable-optimized=yes --enable-backtraces=no --enable-targets=x86_64 --enable-libcpp=yes --enable-zlib=no --enable-terminfo=no --enable-crash-overrides=no
-
Modified: trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory (164268 => 164269)
--- trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2014-02-18 04:10:04 UTC (rev 164268)
+++ trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2014-02-18 04:20:13 UTC (rev 164269)
@@ -192,30 +192,38 @@
my $shouldUpdateLLVMLibraryToken = 0;
if ($useOwnLLVM) {
- if (!-e "$ownLLVMDirectory/Makefile.config") {
+ if (!-e "$ownLLVMDirectory/wkLLVMBuild/Makefile.config") {
print("Configuring LLVM.\n");
- (system("sh", "Tools/Scripts/configure-llvm", $ownLLVMDirectory)==0) or die;
+ (system("mkdir -p $ownLLVMDirectory/wkLLVMBuild"));
+ my $flags = "--enable-optimized=yes --enable-backtraces=no --enable-targets=x86_64 --enable-libcpp=yes --enable-zlib=no --enable-terminfo=no --enable-crash-overrides=no";
+ (system("(cd $ownLLVMDirectory/wkLLVMBuild && ../configure $flags)") == 0) or die;
}
print("Building LLVM.\n");
- chdir $ownLLVMDirectory;
+ chdir "$ownLLVMDirectory/wkLLVMBuild";
+ my $oldPath = $ENV{"PATH"};
+ my $binariesDirectory = "binariesForLLVMBuild";
+ if (-e $binariesDirectory) {
+ $ENV{"PATH"} = File::Spec->rel2abs($binariesDirectory) . ":" . $oldPath;
+ }
(system("(unset PROJECT_NAME ; make -j `sysctl -n hw.activecpu`)") == 0) or die;
+ $ENV{"PATH"} = $oldPath;
chdirWebKit();
my $ownLLVMBuildMode = "";
- if (fileContains($ownLLVMDirectory . "/Makefile.config", "ENABLE_OPTIMIZED=1")) {
+ if (fileContains($ownLLVMDirectory . "/wkLLVMBuild/Makefile.config", "ENABLE_OPTIMIZED=1")) {
$ownLLVMBuildMode .= "Release";
} else {
$ownLLVMBuildMode .= "Debug";
}
- if (fileContains($ownLLVMDirectory . "/Makefile.config", "DISABLE_ASSERTIONS=1")) {
+ if (fileContains($ownLLVMDirectory . "/wkLLVMBuild/Makefile.config", "DISABLE_ASSERTIONS=1")) {
# Nothing to do.
} else {
$ownLLVMBuildMode .= "+Asserts";
}
- my $librarySourceDirectory = "$ownLLVMDirectory/$ownLLVMBuildMode/lib";
+ my $librarySourceDirectory = "$ownLLVMDirectory/wkLLVMBuild/$ownLLVMBuildMode/lib";
my $libraryTargetDirectory = $libraryDir;
$shouldUpdateLLVMLibraryToken = 0;
print("Symlinking libraries from $librarySourceDirectory to $libraryTargetDirectory\n");
@@ -247,11 +255,13 @@
unpackIfNecessary($libraryDir, "$libraryDir/libLLVMCore.a", $llvmLibraryPackage, 1);
}
+ (system("rm", "-f", "$productDir/ExtraIncludesForLocalLLVMBuild") == 0) or die;
if ($useOwnLLVM) {
(system("rm", "-rf", "$productDir/usr/local/LLVMForJavaScriptCore/include/llvm") == 0) or die;
(system("rm", "-rf", "$productDir/usr/local/LLVMForJavaScriptCore/include/llvm-c") == 0) or die;
symlink("$ownLLVMDirectory/include/llvm", "$productDir/usr/local/LLVMForJavaScriptCore/include/llvm") or die;
symlink("$ownLLVMDirectory/include/llvm-c", "$productDir/usr/local/LLVMForJavaScriptCore/include/llvm-c") or die;
+ symlink("$ownLLVMDirectory/wkLLVMBuild/include", "$productDir/ExtraIncludesForLocalLLVMBuild") or die;
} else {
unpackIfNecessary("$productDir/usr/local/LLVMForJavaScriptCore/include", "$productDir/usr/local/LLVMForJavaScriptCore/include/llvm-c/Core.h", $llvmIncludePackage, 0);
}
