<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[164269] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/164269">164269</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-02-17 20:20:13 -0800 (Mon, 17 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>More ARM FTL glue
https://bugs.webkit.org/show_bug.cgi?id=128948
Reviewed by Sam Weinig.
Source/JavaScriptCore:
* 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):
Source/WTF:
* wtf/Platform.h:
Tools:
* 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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsBasexcconfig">trunk/Source/JavaScriptCore/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsLLVMForJSCxcconfig">trunk/Source/JavaScriptCore/Configurations/LLVMForJSC.xcconfig</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerARM64Assemblerh">trunk/Source/JavaScriptCore/assembler/ARM64Assembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredisassemblerLLVMDisassemblercpp">trunk/Source/JavaScriptCore/disassembler/LLVMDisassembler.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLCompilecpp">trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitGPRInfoh">trunk/Source/JavaScriptCore/jit/GPRInfo.h</a></li>
<li><a href="#trunkSourceJavaScriptCorellvmlibraryLLVMExportscpp">trunk/Source/JavaScriptCore/llvm/library/LLVMExports.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptscopywebkitlibrariestoproductdirectory">trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkToolsScriptsconfigurellvm">trunk/Tools/Scripts/configure-llvm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (164268 => 164269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-18 04:10:04 UTC (rev 164268)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-18 04:20:13 UTC (rev 164269)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-02-17 Filip Pizlo <fpizlo@apple.com>
+
+ 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):
+
</ins><span class="cx"> 2014-02-17 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove ENABLE_GLOBAL_FASTMALLOC_NEW
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/Base.xcconfig (164268 => 164269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/Base.xcconfig 2014-02-18 04:10:04 UTC (rev 164268)
+++ trunk/Source/JavaScriptCore/Configurations/Base.xcconfig 2014-02-18 04:20:13 UTC (rev 164269)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> LINKER_DISPLAYS_MANGLED_NAMES = YES;
</span><span class="cx"> PREBINDING = NO;
</span><span class="cx"> 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;
</span><del>-HEADER_SEARCH_PATHS = . icu "${BUILT_PRODUCTS_DIR}/usr/local/LLVMForJavaScriptCore/include" /usr/local/LLVMForJavaScriptCore/include "${BUILT_PRODUCTS_DIR}/usr/local/include" $(HEADER_SEARCH_PATHS);
</del><ins>+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);
</ins><span class="cx">
</span><span class="cx"> TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsLLVMForJSCxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/LLVMForJSC.xcconfig (164268 => 164269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/LLVMForJSC.xcconfig 2014-02-18 04:10:04 UTC (rev 164268)
+++ trunk/Source/JavaScriptCore/Configurations/LLVMForJSC.xcconfig 2014-02-18 04:20:13 UTC (rev 164269)
</span><span class="lines">@@ -27,13 +27,16 @@
</span><span class="cx"> // Prevent C++ standard library operator new, delete and their related exception types from being exported as weak symbols.
</span><span class="cx"> 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;
</span><span class="cx">
</span><ins>+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;
+
</ins><span class="cx"> OTHER_LDFLAGS_LLVM = $(OTHER_LDFLAGS_LLVM_$(ENABLE_FTL_JIT));
</span><span class="cx"> OTHER_LDFLAGS_LLVM_ = ;
</span><del>-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;
</del><ins>+OTHER_LDFLAGS_LLVM_ENABLE_FTL_JIT = -lpthread -lm -L/usr/local/LLVMForJavaScriptCore/lib $(LLVM_LIBS_$(PLATFORM_NAME));
</ins><span class="cx">
</span><span class="cx"> OTHER_LDFLAGS_BASE = -lobjc -Wl,-Y,3 $(OTHER_LDFLAGS_HIDE_SYMBOLS);
</span><span class="cx"> OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
</span><del>-OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_BASE);
</del><ins>+OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_BASE) $(OTHER_LDFLAGS_LLVM);
</ins><span class="cx"> OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
</span><span class="cx"> OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) $(OTHER_LDFLAGS_LLVM)
</span><span class="cx"> GCC_SYMBOLS_PRIVATE_EXTERN = YES;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerARM64Assemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/ARM64Assembler.h (164268 => 164269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/ARM64Assembler.h 2014-02-18 04:10:04 UTC (rev 164268)
+++ trunk/Source/JavaScriptCore/assembler/ARM64Assembler.h 2014-02-18 04:20:13 UTC (rev 164269)
</span><span class="lines">@@ -1669,6 +1669,14 @@
</span><span class="cx"> insn(nopPseudo());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ 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();
+ }
+
</ins><span class="cx"> ALWAYS_INLINE void dmbSY()
</span><span class="cx"> {
</span><span class="cx"> insn(0xd5033fbf);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredisassemblerLLVMDisassemblercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/disassembler/LLVMDisassembler.cpp (164268 => 164269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/disassembler/LLVMDisassembler.cpp 2014-02-18 04:10:04 UTC (rev 164268)
+++ trunk/Source/JavaScriptCore/disassembler/LLVMDisassembler.cpp 2014-02-18 04:20:13 UTC (rev 164269)
</span><span class="lines">@@ -87,6 +87,8 @@
</span><span class="cx"> triple = "x86_64-apple-darwin";
</span><span class="cx"> #elif CPU(X86)
</span><span class="cx"> triple = "x86-apple-darwin";
</span><ins>+#elif CPU(ARM64)
+ triple = "arm64-apple-darwin";
</ins><span class="cx"> #else
</span><span class="cx"> #error "LLVM disassembler currently not supported on this CPU."
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLCompilecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp (164268 => 164269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp 2014-02-18 04:10:04 UTC (rev 164268)
+++ trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp 2014-02-18 04:20:13 UTC (rev 164269)
</span><span class="lines">@@ -344,8 +344,8 @@
</span><span class="cx">
</span><span class="cx"> JITPutByIdGenerator gen(
</span><span class="cx"> codeBlock, putById.codeOrigin(), usedRegisters, JSValueRegs(base),
</span><del>- JSValueRegs(value), MacroAssembler::scratchRegister, false, putById.ecmaMode(),
- putById.putKind());
</del><ins>+ JSValueRegs(value), GPRInfo::patchpointScratchRegister, false,
+ putById.ecmaMode(), putById.putKind());
</ins><span class="cx">
</span><span class="cx"> MacroAssembler::Label begin = slowPathJIT.label();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitGPRInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/GPRInfo.h (164268 => 164269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/GPRInfo.h 2014-02-18 04:10:04 UTC (rev 164268)
+++ trunk/Source/JavaScriptCore/jit/GPRInfo.h 2014-02-18 04:20:13 UTC (rev 164269)
</span><span class="lines">@@ -399,6 +399,7 @@
</span><span class="cx"> static const GPRReg returnValueGPR = X86Registers::eax; // regT0
</span><span class="cx"> static const GPRReg returnValueGPR2 = X86Registers::edx; // regT1
</span><span class="cx"> static const GPRReg nonPreservedNonReturnGPR = X86Registers::esi;
</span><ins>+ static const GPRReg patchpointScratchRegister = MacroAssembler::scratchRegister;
</ins><span class="cx">
</span><span class="cx"> static GPRReg toRegister(unsigned index)
</span><span class="cx"> {
</span><span class="lines">@@ -573,6 +574,7 @@
</span><span class="cx"> static const GPRReg returnValueGPR = ARM64Registers::x0; // regT0
</span><span class="cx"> static const GPRReg returnValueGPR2 = ARM64Registers::x1; // regT1
</span><span class="cx"> static const GPRReg nonPreservedNonReturnGPR = ARM64Registers::x2;
</span><ins>+ static const GPRReg patchpointScratchRegister = ARM64Registers::ip0;
</ins><span class="cx">
</span><span class="cx"> // GPRReg mapping is direct, the machine regsiter numbers can
</span><span class="cx"> // be used directly as indices into the GPR RegisterBank.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellvmlibraryLLVMExportscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llvm/library/LLVMExports.cpp (164268 => 164269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llvm/library/LLVMExports.cpp 2014-02-18 04:10:04 UTC (rev 164268)
+++ trunk/Source/JavaScriptCore/llvm/library/LLVMExports.cpp 2014-02-18 04:20:13 UTC (rev 164269)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -48,8 +48,15 @@
</span><span class="cx">
</span><span class="cx"> LLVMLinkInMCJIT();
</span><span class="cx"> LLVMInitializeNativeTarget();
</span><ins>+#if CPU(X86_64)
</ins><span class="cx"> LLVMInitializeX86AsmPrinter();
</span><span class="cx"> LLVMInitializeX86Disassembler();
</span><ins>+#elif CPU(ARM64)
+ LLVMInitializeARM64AsmPrinter();
+ LLVMInitializeARM64Disassembler();
+#else
+ UNREACHABLE_FOR_PLATFORM();
+#endif
</ins><span class="cx">
</span><span class="cx"> JSC::LLVMAPI* result = new JSC::LLVMAPI;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (164268 => 164269)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-02-17 Filip Pizlo <fpizlo@apple.com>
+
+ More ARM FTL glue
+ https://bugs.webkit.org/show_bug.cgi?id=128948
+
+ Reviewed by Sam Weinig.
+
+ * wtf/Platform.h:
+
</ins><span class="cx"> 2014-02-17 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove ENABLE_GLOBAL_FASTMALLOC_NEW
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (164268 => 164269)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -646,7 +646,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> /* Do we have LLVM? */
</span><del>-#if !defined(HAVE_LLVM) && OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) && ENABLE(FTL_JIT) && CPU(X86_64)
</del><ins>+#if !defined(HAVE_LLVM) && OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) && ENABLE(FTL_JIT) && (CPU(X86_64) || CPU(ARM64))
</ins><span class="cx"> #define HAVE_LLVM 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -662,7 +662,7 @@
</span><span class="cx">
</span><span class="cx"> /* If possible, try to enable the LLVM disassembler. This is optional and we can
</span><span class="cx"> fall back on UDis86 if necessary. */
</span><del>-#if !defined(WTF_USE_LLVM_DISASSEMBLER) && HAVE(LLVM) && (CPU(X86_64) || CPU(X86))
</del><ins>+#if !defined(WTF_USE_LLVM_DISASSEMBLER) && HAVE(LLVM) && (CPU(X86_64) || CPU(X86) || CPU(ARM64))
</ins><span class="cx"> #define WTF_USE_LLVM_DISASSEMBLER 1
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (164268 => 164269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-02-18 04:10:04 UTC (rev 164268)
+++ trunk/Tools/ChangeLog 2014-02-18 04:20:13 UTC (rev 164269)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-02-17 Filip Pizlo <fpizlo@apple.com>
+
+ 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.
+
</ins><span class="cx"> 2014-02-17 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] There's another Windows SDK. Make sure we recognize it.
</span></span></pre></div>
<a id="trunkToolsScriptsconfigurellvm"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/Scripts/configure-llvm (164268 => 164269)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,41 +0,0 @@
</span><del>-#!/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
-
</del></span></pre></div>
<a id="trunkToolsScriptscopywebkitlibrariestoproductdirectory"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory (164268 => 164269)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -192,30 +192,38 @@
</span><span class="cx"> my $shouldUpdateLLVMLibraryToken = 0;
</span><span class="cx">
</span><span class="cx"> if ($useOwnLLVM) {
</span><del>- if (!-e "$ownLLVMDirectory/Makefile.config") {
</del><ins>+ if (!-e "$ownLLVMDirectory/wkLLVMBuild/Makefile.config") {
</ins><span class="cx"> print("Configuring LLVM.\n");
</span><del>- (system("sh", "Tools/Scripts/configure-llvm", $ownLLVMDirectory)==0) or die;
</del><ins>+ (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;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> print("Building LLVM.\n");
</span><del>- chdir $ownLLVMDirectory;
</del><ins>+ chdir "$ownLLVMDirectory/wkLLVMBuild";
+ my $oldPath = $ENV{"PATH"};
+ my $binariesDirectory = "binariesForLLVMBuild";
+ if (-e $binariesDirectory) {
+ $ENV{"PATH"} = File::Spec->rel2abs($binariesDirectory) . ":" . $oldPath;
+ }
</ins><span class="cx"> (system("(unset PROJECT_NAME ; make -j `sysctl -n hw.activecpu`)") == 0) or die;
</span><ins>+ $ENV{"PATH"} = $oldPath;
</ins><span class="cx"> chdirWebKit();
</span><span class="cx">
</span><span class="cx"> my $ownLLVMBuildMode = "";
</span><del>- if (fileContains($ownLLVMDirectory . "/Makefile.config", "ENABLE_OPTIMIZED=1")) {
</del><ins>+ if (fileContains($ownLLVMDirectory . "/wkLLVMBuild/Makefile.config", "ENABLE_OPTIMIZED=1")) {
</ins><span class="cx"> $ownLLVMBuildMode .= "Release";
</span><span class="cx"> } else {
</span><span class="cx"> $ownLLVMBuildMode .= "Debug";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (fileContains($ownLLVMDirectory . "/Makefile.config", "DISABLE_ASSERTIONS=1")) {
</del><ins>+ if (fileContains($ownLLVMDirectory . "/wkLLVMBuild/Makefile.config", "DISABLE_ASSERTIONS=1")) {
</ins><span class="cx"> # Nothing to do.
</span><span class="cx"> } else {
</span><span class="cx"> $ownLLVMBuildMode .= "+Asserts";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- my $librarySourceDirectory = "$ownLLVMDirectory/$ownLLVMBuildMode/lib";
</del><ins>+ my $librarySourceDirectory = "$ownLLVMDirectory/wkLLVMBuild/$ownLLVMBuildMode/lib";
</ins><span class="cx"> my $libraryTargetDirectory = $libraryDir;
</span><span class="cx"> $shouldUpdateLLVMLibraryToken = 0;
</span><span class="cx"> print("Symlinking libraries from $librarySourceDirectory to $libraryTargetDirectory\n");
</span><span class="lines">@@ -247,11 +255,13 @@
</span><span class="cx"> unpackIfNecessary($libraryDir, "$libraryDir/libLLVMCore.a", $llvmLibraryPackage, 1);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ (system("rm", "-f", "$productDir/ExtraIncludesForLocalLLVMBuild") == 0) or die;
</ins><span class="cx"> if ($useOwnLLVM) {
</span><span class="cx"> (system("rm", "-rf", "$productDir/usr/local/LLVMForJavaScriptCore/include/llvm") == 0) or die;
</span><span class="cx"> (system("rm", "-rf", "$productDir/usr/local/LLVMForJavaScriptCore/include/llvm-c") == 0) or die;
</span><span class="cx"> symlink("$ownLLVMDirectory/include/llvm", "$productDir/usr/local/LLVMForJavaScriptCore/include/llvm") or die;
</span><span class="cx"> symlink("$ownLLVMDirectory/include/llvm-c", "$productDir/usr/local/LLVMForJavaScriptCore/include/llvm-c") or die;
</span><ins>+ symlink("$ownLLVMDirectory/wkLLVMBuild/include", "$productDir/ExtraIncludesForLocalLLVMBuild") or die;
</ins><span class="cx"> } else {
</span><span class="cx"> unpackIfNecessary("$productDir/usr/local/LLVMForJavaScriptCore/include", "$productDir/usr/local/LLVMForJavaScriptCore/include/llvm-c/Core.h", $llvmIncludePackage, 0);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>