Bug 1304672: Rename asmjs/ directory to wasm/; r=luke

MozReview-Commit-ID: 5B23MCOlmKX

--HG--
rename : js/src/asmjs/AsmJS.cpp => js/src/wasm/AsmJS.cpp
rename : js/src/asmjs/AsmJS.h => js/src/wasm/AsmJS.h
rename : js/src/asmjs/WasmAST.h => js/src/wasm/WasmAST.h
rename : js/src/asmjs/WasmBaselineCompile.cpp => js/src/wasm/WasmBaselineCompile.cpp
rename : js/src/asmjs/WasmBaselineCompile.h => js/src/wasm/WasmBaselineCompile.h
rename : js/src/asmjs/WasmBinary.cpp => js/src/wasm/WasmBinary.cpp
rename : js/src/asmjs/WasmBinary.h => js/src/wasm/WasmBinary.h
rename : js/src/asmjs/WasmBinaryFormat.cpp => js/src/wasm/WasmBinaryFormat.cpp
rename : js/src/asmjs/WasmBinaryFormat.h => js/src/wasm/WasmBinaryFormat.h
rename : js/src/asmjs/WasmBinaryIterator.cpp => js/src/wasm/WasmBinaryIterator.cpp
rename : js/src/asmjs/WasmBinaryIterator.h => js/src/wasm/WasmBinaryIterator.h
rename : js/src/asmjs/WasmBinaryToAST.cpp => js/src/wasm/WasmBinaryToAST.cpp
rename : js/src/asmjs/WasmBinaryToAST.h => js/src/wasm/WasmBinaryToAST.h
rename : js/src/asmjs/WasmBinaryToExperimentalText.cpp => js/src/wasm/WasmBinaryToExperimentalText.cpp
rename : js/src/asmjs/WasmBinaryToExperimentalText.h => js/src/wasm/WasmBinaryToExperimentalText.h
rename : js/src/asmjs/WasmBinaryToText.cpp => js/src/wasm/WasmBinaryToText.cpp
rename : js/src/asmjs/WasmBinaryToText.h => js/src/wasm/WasmBinaryToText.h
rename : js/src/asmjs/WasmCode.cpp => js/src/wasm/WasmCode.cpp
rename : js/src/asmjs/WasmCode.h => js/src/wasm/WasmCode.h
rename : js/src/asmjs/WasmCompartment.cpp => js/src/wasm/WasmCompartment.cpp
rename : js/src/asmjs/WasmCompartment.h => js/src/wasm/WasmCompartment.h
rename : js/src/asmjs/WasmCompile.cpp => js/src/wasm/WasmCompile.cpp
rename : js/src/asmjs/WasmCompile.h => js/src/wasm/WasmCompile.h
rename : js/src/asmjs/WasmFrameIterator.cpp => js/src/wasm/WasmFrameIterator.cpp
rename : js/src/asmjs/WasmFrameIterator.h => js/src/wasm/WasmFrameIterator.h
rename : js/src/asmjs/WasmGeneratedSourceMap.h => js/src/wasm/WasmGeneratedSourceMap.h
rename : js/src/asmjs/WasmGenerator.cpp => js/src/wasm/WasmGenerator.cpp
rename : js/src/asmjs/WasmGenerator.h => js/src/wasm/WasmGenerator.h
rename : js/src/asmjs/WasmInstance.cpp => js/src/wasm/WasmInstance.cpp
rename : js/src/asmjs/WasmInstance.h => js/src/wasm/WasmInstance.h
rename : js/src/asmjs/WasmIonCompile.cpp => js/src/wasm/WasmIonCompile.cpp
rename : js/src/asmjs/WasmIonCompile.h => js/src/wasm/WasmIonCompile.h
rename : js/src/asmjs/WasmJS.cpp => js/src/wasm/WasmJS.cpp
rename : js/src/asmjs/WasmJS.h => js/src/wasm/WasmJS.h
rename : js/src/asmjs/WasmModule.cpp => js/src/wasm/WasmModule.cpp
rename : js/src/asmjs/WasmModule.h => js/src/wasm/WasmModule.h
rename : js/src/asmjs/WasmSerialize.h => js/src/wasm/WasmSerialize.h
rename : js/src/asmjs/WasmSignalHandlers.cpp => js/src/wasm/WasmSignalHandlers.cpp
rename : js/src/asmjs/WasmSignalHandlers.h => js/src/wasm/WasmSignalHandlers.h
rename : js/src/asmjs/WasmStubs.cpp => js/src/wasm/WasmStubs.cpp
rename : js/src/asmjs/WasmStubs.h => js/src/wasm/WasmStubs.h
rename : js/src/asmjs/WasmTable.cpp => js/src/wasm/WasmTable.cpp
rename : js/src/asmjs/WasmTable.h => js/src/wasm/WasmTable.h
rename : js/src/asmjs/WasmTextToBinary.cpp => js/src/wasm/WasmTextToBinary.cpp
rename : js/src/asmjs/WasmTextToBinary.h => js/src/wasm/WasmTextToBinary.h
rename : js/src/asmjs/WasmTextUtils.cpp => js/src/wasm/WasmTextUtils.cpp
rename : js/src/asmjs/WasmTextUtils.h => js/src/wasm/WasmTextUtils.h
rename : js/src/asmjs/WasmTypes.cpp => js/src/wasm/WasmTypes.cpp
rename : js/src/asmjs/WasmTypes.h => js/src/wasm/WasmTypes.h
extra : rebase_source : b177b242026c7b42c5502eeadb968bc548cd82ce

js/src/builtin/AtomicsObject.cpp

@@ -56,13 +56,13 @@
 #include "jsfriendapi.h"
 #include "jsnum.h"
 
-#include "asmjs/WasmInstance.h"
 #include "jit/AtomicOperations.h"
 #include "jit/InlinableNatives.h"
 #include "js/Class.h"
 #include "vm/GlobalObject.h"
 #include "vm/Time.h"
 #include "vm/TypedArrayObject.h"
+#include "wasm/WasmInstance.h"
 
 #include "jsobjinlines.h"
 

js/src/builtin/TestingFunctions.cpp

@@ -21,13 +21,6 @@
 #include "jsprf.h"
 #include "jswrapper.h"
 
-#include "asmjs/AsmJS.h"
-#include "asmjs/WasmBinaryToExperimentalText.h"
-#include "asmjs/WasmBinaryToText.h"
-#include "asmjs/WasmJS.h"
-#include "asmjs/WasmModule.h"
-#include "asmjs/WasmSignalHandlers.h"
-#include "asmjs/WasmTextToBinary.h"
 #include "builtin/Promise.h"
 #include "builtin/SelfHostingDefines.h"
 #ifdef DEBUG
@@ -53,6 +46,13 @@
 #include "vm/Stack.h"
 #include "vm/StringBuffer.h"
 #include "vm/TraceLogging.h"
+#include "wasm/AsmJS.h"
+#include "wasm/WasmBinaryToExperimentalText.h"
+#include "wasm/WasmBinaryToText.h"
+#include "wasm/WasmJS.h"
+#include "wasm/WasmModule.h"
+#include "wasm/WasmSignalHandlers.h"
+#include "wasm/WasmTextToBinary.h"
 
 #include "jscntxtinlines.h"
 #include "jsobjinlines.h"

js/src/frontend/BytecodeCompiler.cpp

@@ -11,7 +11,6 @@
 #include "jscntxt.h"
 #include "jsscript.h"
 
-#include "asmjs/AsmJS.h"
 #include "builtin/ModuleObject.h"
 #include "frontend/BytecodeEmitter.h"
 #include "frontend/FoldConstants.h"
@@ -19,6 +18,7 @@
 #include "frontend/Parser.h"
 #include "vm/GlobalObject.h"
 #include "vm/TraceLogging.h"
+#include "wasm/AsmJS.h"
 
 #include "jsobjinlines.h"
 #include "jsscriptinlines.h"

js/src/frontend/BytecodeEmitter.cpp

@@ -28,12 +28,12 @@
 #include "jstypes.h"
 #include "jsutil.h"
 
-#include "asmjs/AsmJS.h"
 #include "frontend/Parser.h"
 #include "frontend/TokenStream.h"
 #include "vm/Debugger.h"
 #include "vm/GeneratorObject.h"
 #include "vm/Stack.h"
+#include "wasm/AsmJS.h"
 
 #include "jsatominlines.h"
 #include "jsobjinlines.h"

js/src/frontend/Parser.cpp

@@ -27,12 +27,12 @@
 #include "jsscript.h"
 #include "jstypes.h"
 
-#include "asmjs/AsmJS.h"
 #include "builtin/ModuleObject.h"
 #include "builtin/SelfHostingDefines.h"
 #include "frontend/BytecodeCompiler.h"
 #include "frontend/FoldConstants.h"
 #include "frontend/TokenStream.h"
+#include "wasm/AsmJS.h"
 
 #include "jsatominlines.h"
 #include "jsscriptinlines.h"

js/src/gc/Barrier.cpp

@@ -9,7 +9,6 @@
 #include "jscompartment.h"
 #include "jsobj.h"
 
-#include "asmjs/WasmJS.h"
 #include "builtin/TypedObject.h"
 #include "gc/Policy.h"
 #include "gc/Zone.h"
@@ -18,6 +17,7 @@
 #include "vm/EnvironmentObject.h"
 #include "vm/SharedArrayObject.h"
 #include "vm/Symbol.h"
+#include "wasm/WasmJS.h"
 
 namespace js {
 

js/src/gc/Marking.cpp

@@ -15,7 +15,6 @@
 #include "jsgc.h"
 #include "jsprf.h"
 
-#include "asmjs/WasmJS.h"
 #include "builtin/ModuleObject.h"
 #include "gc/GCInternals.h"
 #include "gc/Policy.h"
@@ -30,6 +29,7 @@
 #include "vm/Symbol.h"
 #include "vm/TypedArrayObject.h"
 #include "vm/UnboxedObject.h"
+#include "wasm/WasmJS.h"
 
 #include "jscompartmentinlines.h"
 #include "jsgcinlines.h"

js/src/jit/BaselineJIT.cpp

@@ -10,7 +10,6 @@
 #include "mozilla/DebugOnly.h"
 #include "mozilla/MemoryReporting.h"
 
-#include "asmjs/WasmInstance.h"
 #include "jit/BaselineCompiler.h"
 #include "jit/BaselineIC.h"
 #include "jit/CompileInfo.h"
@@ -19,6 +18,7 @@
 #include "vm/Debugger.h"
 #include "vm/Interpreter.h"
 #include "vm/TraceLogging.h"
+#include "wasm/WasmInstance.h"
 
 #include "jsobjinlines.h"
 #include "jsopcodeinlines.h"

js/src/jit/Lowering.cpp

@@ -8,11 +8,11 @@
 
 #include "mozilla/DebugOnly.h"
 
-#include "asmjs/WasmSignalHandlers.h"
 #include "jit/JitSpewer.h"
 #include "jit/LIR.h"
 #include "jit/MIR.h"
 #include "jit/MIRGraph.h"
+#include "wasm/WasmSignalHandlers.h"
 
 #include "jsobjinlines.h"
 #include "jsopcodeinlines.h"

js/src/jit/MIRGraph.cpp

@@ -6,12 +6,12 @@
 
 #include "jit/MIRGraph.h"
 
-#include "asmjs/WasmTypes.h"
 #include "jit/BytecodeAnalysis.h"
 #include "jit/Ion.h"
 #include "jit/JitSpewer.h"
 #include "jit/MIR.h"
 #include "jit/MIRGenerator.h"
+#include "wasm/WasmTypes.h"
 
 using namespace js;
 using namespace js::jit;

js/src/jit/arm/MacroAssembler-arm.cpp

@@ -11,13 +11,13 @@
 #include "mozilla/DebugOnly.h"
 #include "mozilla/MathAlgorithms.h"
 
-#include "asmjs/WasmBinary.h"
 #include "jit/arm/Simulator-arm.h"
 #include "jit/Bailouts.h"
 #include "jit/BaselineFrame.h"
 #include "jit/JitFrames.h"
 #include "jit/MacroAssembler.h"
 #include "jit/MoveEmitter.h"
+#include "wasm/WasmBinary.h"
 
 #include "jit/MacroAssembler-inl.h"
 

js/src/jit/arm/Simulator-arm.cpp

@@ -35,14 +35,14 @@
 #include "mozilla/MathAlgorithms.h"
 #include "mozilla/SizePrintfMacros.h"
 
-#include "asmjs/WasmInstance.h"
-#include "asmjs/WasmSignalHandlers.h"
 #include "jit/arm/Assembler-arm.h"
 #include "jit/arm/disasm/Constants-arm.h"
 #include "jit/AtomicOperations.h"
 #include "threading/LockGuard.h"
 #include "vm/Runtime.h"
 #include "vm/SharedMem.h"
+#include "wasm/WasmInstance.h"
+#include "wasm/WasmSignalHandlers.h"
 
 extern "C" {
 

js/src/jit/shared/Assembler-shared.h

@@ -11,13 +11,13 @@
 
 #include <limits.h>
 
-#include "asmjs/WasmTypes.h"
 #include "jit/AtomicOp.h"
 #include "jit/JitAllocPolicy.h"
 #include "jit/Label.h"
 #include "jit/Registers.h"
 #include "jit/RegisterSets.h"
 #include "vm/HelperThreads.h"
+#include "wasm/WasmTypes.h"
 
 #if defined(JS_CODEGEN_ARM) || defined(JS_CODEGEN_ARM64) || \
     defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_MIPS64)

js/src/jsapi-tests/testWasmLEB128.cpp

@@ -4,10 +4,10 @@
 
 #include <stdlib.h>
 
-#include "asmjs/WasmBinary.h"
-
 #include "jsapi-tests/tests.h"
 
+#include "wasm/WasmBinary.h"
+
 static bool WriteValidBytes(js::wasm::Encoder& encoder, bool* passed)
 {
     *passed = false;

js/src/jsapi.cpp

@@ -42,8 +42,6 @@
 #include "jsweakmap.h"
 #include "jswrapper.h"
 
-#include "asmjs/AsmJS.h"
-#include "asmjs/WasmModule.h"
 #include "builtin/AtomicsObject.h"
 #include "builtin/Eval.h"
 #include "builtin/Intl.h"
@@ -90,6 +88,8 @@
 #include "vm/TypedArrayCommon.h"
 #include "vm/WrapperObject.h"
 #include "vm/Xdr.h"
+#include "wasm/AsmJS.h"
+#include "wasm/WasmModule.h"
 
 #include "jsatominlines.h"
 #include "jsfuninlines.h"

js/src/jscompartment.h

@@ -14,7 +14,6 @@
 #include "mozilla/Variant.h"
 #include "mozilla/XorShift128PlusRNG.h"
 
-#include "asmjs/WasmCompartment.h"
 #include "builtin/RegExp.h"
 #include "gc/Barrier.h"
 #include "gc/NurseryAwareHashMap.h"
@@ -23,6 +22,7 @@
 #include "vm/PIC.h"
 #include "vm/SavedStacks.h"
 #include "vm/Time.h"
+#include "wasm/WasmCompartment.h"
 
 namespace js {
 

js/src/jsscriptinlines.h

@@ -9,10 +9,10 @@
 
 #include "jsscript.h"
 
-#include "asmjs/AsmJS.h"
 #include "jit/BaselineJIT.h"
 #include "jit/IonAnalysis.h"
 #include "vm/EnvironmentObject.h"
+#include "wasm/AsmJS.h"
 
 #include "jscompartmentinlines.h"
 

js/src/moz.build

@@ -18,7 +18,7 @@ with Files('../public/**'):
 with Files('*'):
     BUG_COMPONENT = component_engine
 
-with Files('asmjs/**'):
+with Files('wasm/**'):
     BUG_COMPONENT = component_jit
 with Files('builtin/**'):
     BUG_COMPONENT = component_stl
@@ -154,29 +154,6 @@ EXPORTS.js += [
 ]
 
 UNIFIED_SOURCES += [
-    'asmjs/AsmJS.cpp',
-    'asmjs/WasmBaselineCompile.cpp',
-    'asmjs/WasmBinary.cpp',
-    'asmjs/WasmBinaryFormat.cpp',
-    'asmjs/WasmBinaryIterator.cpp',
-    'asmjs/WasmBinaryToAST.cpp',
-    'asmjs/WasmBinaryToExperimentalText.cpp',
-    'asmjs/WasmBinaryToText.cpp',
-    'asmjs/WasmCode.cpp',
-    'asmjs/WasmCompartment.cpp',
-    'asmjs/WasmCompile.cpp',
-    'asmjs/WasmFrameIterator.cpp',
-    'asmjs/WasmGenerator.cpp',
-    'asmjs/WasmInstance.cpp',
-    'asmjs/WasmIonCompile.cpp',
-    'asmjs/WasmJS.cpp',
-    'asmjs/WasmModule.cpp',
-    'asmjs/WasmSignalHandlers.cpp',
-    'asmjs/WasmStubs.cpp',
-    'asmjs/WasmTable.cpp',
-    'asmjs/WasmTextToBinary.cpp',
-    'asmjs/WasmTextUtils.cpp',
-    'asmjs/WasmTypes.cpp',
     'builtin/AtomicsObject.cpp',
     'builtin/Eval.cpp',
     'builtin/Intl.cpp',
@@ -378,7 +355,30 @@ UNIFIED_SOURCES += [
     'vm/Unicode.cpp',
     'vm/Value.cpp',
     'vm/WeakMapPtr.cpp',
-    'vm/Xdr.cpp'
+    'vm/Xdr.cpp',
+    'wasm/AsmJS.cpp',
+    'wasm/WasmBaselineCompile.cpp',
+    'wasm/WasmBinary.cpp',
+    'wasm/WasmBinaryFormat.cpp',
+    'wasm/WasmBinaryIterator.cpp',
+    'wasm/WasmBinaryToAST.cpp',
+    'wasm/WasmBinaryToExperimentalText.cpp',
+    'wasm/WasmBinaryToText.cpp',
+    'wasm/WasmCode.cpp',
+    'wasm/WasmCompartment.cpp',
+    'wasm/WasmCompile.cpp',
+    'wasm/WasmFrameIterator.cpp',
+    'wasm/WasmGenerator.cpp',
+    'wasm/WasmInstance.cpp',
+    'wasm/WasmIonCompile.cpp',
+    'wasm/WasmJS.cpp',
+    'wasm/WasmModule.cpp',
+    'wasm/WasmSignalHandlers.cpp',
+    'wasm/WasmStubs.cpp',
+    'wasm/WasmTable.cpp',
+    'wasm/WasmTextToBinary.cpp',
+    'wasm/WasmTextUtils.cpp',
+    'wasm/WasmTypes.cpp'
 ]
 
 # jsarray.cpp and jsatom.cpp cannot be built in unified mode because

js/src/shell/js.cpp

@@ -62,7 +62,6 @@
 #include "jswrapper.h"
 #include "shellmoduleloader.out.h"
 
-#include "asmjs/WasmJS.h"
 #include "builtin/ModuleObject.h"
 #include "builtin/TestingFunctions.h"
 #include "frontend/Parser.h"
@@ -96,6 +95,7 @@
 #include "vm/Time.h"
 #include "vm/TypedArrayObject.h"
 #include "vm/WrapperObject.h"
+#include "wasm/WasmJS.h"
 
 #include "jscompartmentinlines.h"
 #include "jsobjinlines.h"

js/src/vm/ArrayBufferObject.cpp

@@ -37,8 +37,6 @@
 #endif
 #include "jswrapper.h"
 
-#include "asmjs/WasmSignalHandlers.h"
-#include "asmjs/WasmTypes.h"
 #include "gc/Barrier.h"
 #include "gc/Marking.h"
 #include "gc/Memory.h"
@@ -48,6 +46,8 @@
 #include "vm/Interpreter.h"
 #include "vm/SharedArrayObject.h"
 #include "vm/WrapperObject.h"
+#include "wasm/WasmSignalHandlers.h"
+#include "wasm/WasmTypes.h"
 
 #include "jsatominlines.h"
 

js/src/vm/Debugger.cpp

@@ -20,7 +20,6 @@
 #include "jsprf.h"
 #include "jswrapper.h"
 
-#include "asmjs/WasmInstance.h"
 #include "frontend/BytecodeCompiler.h"
 #include "frontend/Parser.h"
 #include "gc/Marking.h"
@@ -37,6 +36,7 @@
 #include "vm/SPSProfiler.h"
 #include "vm/TraceLogging.h"
 #include "vm/WrapperObject.h"
+#include "wasm/WasmInstance.h"
 
 #include "jsgcinlines.h"
 #include "jsobjinlines.h"

js/src/vm/Debugger.h

@@ -18,7 +18,6 @@
 #include "jsweakmap.h"
 #include "jswrapper.h"
 
-#include "asmjs/WasmJS.h"
 #include "builtin/Promise.h"
 #include "ds/TraceableFifo.h"
 #include "gc/Barrier.h"
@@ -27,6 +26,7 @@
 #include "js/HashTable.h"
 #include "vm/GlobalObject.h"
 #include "vm/SavedStacks.h"
+#include "wasm/WasmJS.h"
 
 enum JSTrapStatus {
     JSTRAP_ERROR,

js/src/vm/GlobalObject.cpp

@@ -15,7 +15,6 @@
 #include "jsprototypes.h"
 #include "jsweakmap.h"
 
-#include "asmjs/WasmJS.h"
 #include "builtin/AtomicsObject.h"
 #include "builtin/Eval.h"
 #if EXPOSE_INTL_API
@@ -40,6 +39,7 @@
 #include "vm/RegExpStatics.h"
 #include "vm/RegExpStaticsObject.h"
 #include "vm/StopIterationObject.h"
+#include "wasm/WasmJS.h"
 
 #include "jscompartmentinlines.h"
 #include "jsobjinlines.h"

js/src/vm/HelperThreads.cpp

@@ -12,7 +12,6 @@
 #include "jsnativestack.h"
 #include "jsnum.h" // For FIX_FPU()
 
-#include "asmjs/WasmIonCompile.h"
 #include "builtin/Promise.h"
 #include "frontend/BytecodeCompiler.h"
 #include "gc/GCInternals.h"
@@ -21,6 +20,7 @@
 #include "vm/SharedImmutableStringsCache.h"
 #include "vm/Time.h"
 #include "vm/TraceLogging.h"
+#include "wasm/WasmIonCompile.h"
 
 #include "jscntxtinlines.h"
 #include "jscompartmentinlines.h"

js/src/vm/Initialization.cpp

@@ -14,7 +14,6 @@
 
 #include "jstypes.h"
 
-#include "asmjs/WasmInstance.h"
 #include "builtin/AtomicsObject.h"
 #include "ds/MemoryProtectionExceptionHandler.h"
 #include "gc/Statistics.h"
@@ -30,6 +29,7 @@
 #include "vm/Runtime.h"
 #include "vm/Time.h"
 #include "vm/TraceLogging.h"
+#include "wasm/WasmInstance.h"
 
 using JS::detail::InitState;
 using JS::detail::libraryInitState;

js/src/vm/MemoryMetrics.cpp

@@ -14,9 +14,6 @@
 #include "jsobj.h"
 #include "jsscript.h"
 
-#include "asmjs/WasmInstance.h"
-#include "asmjs/WasmJS.h"
-#include "asmjs/WasmModule.h"
 #include "gc/Heap.h"
 #include "jit/BaselineJIT.h"
 #include "jit/Ion.h"
@@ -26,6 +23,9 @@
 #include "vm/String.h"
 #include "vm/Symbol.h"
 #include "vm/WrapperObject.h"
+#include "wasm/WasmInstance.h"
+#include "wasm/WasmJS.h"
+#include "wasm/WasmModule.h"
 
 using mozilla::DebugOnly;
 using mozilla::MallocSizeOf;

js/src/vm/Runtime.cpp

@@ -38,7 +38,6 @@
 #include "jswin.h"
 #include "jswrapper.h"
 
-#include "asmjs/WasmSignalHandlers.h"
 #include "builtin/Promise.h"
 #include "gc/GCInternals.h"
 #include "jit/arm/Simulator-arm.h"
@@ -52,6 +51,7 @@
 #include "js/MemoryMetrics.h"
 #include "js/SliceBudget.h"
 #include "vm/Debugger.h"
+#include "wasm/WasmSignalHandlers.h"
 
 #include "jscntxtinlines.h"
 #include "jsgcinlines.h"

js/src/vm/Runtime.h

@@ -23,7 +23,7 @@
 #include "jsscript.h"
 
 #ifdef XP_DARWIN
-# include "asmjs/WasmSignalHandlers.h"
+# include "wasm/WasmSignalHandlers.h"
 #endif
 #include "builtin/AtomicsObject.h"
 #include "builtin/Promise.h"

js/src/vm/SharedArrayObject.cpp

@@ -22,10 +22,10 @@
 # include <valgrind/memcheck.h>
 #endif
 
-#include "asmjs/AsmJS.h"
-#include "asmjs/WasmTypes.h"
 #include "vm/SharedMem.h"
 #include "vm/TypedArrayCommon.h"
+#include "wasm/AsmJS.h"
+#include "wasm/WasmTypes.h"
 
 #include "jsobjinlines.h"
 

js/src/vm/Stack.h

@@ -16,7 +16,6 @@
 #include "jsscript.h"
 #include "jsutil.h"
 
-#include "asmjs/WasmFrameIterator.h"
 #include "gc/Rooting.h"
 #include "jit/JitFrameIterator.h"
 #ifdef CHECK_OSIPOINT_REGISTERS
@@ -25,6 +24,7 @@
 #include "js/RootingAPI.h"
 #include "vm/ArgumentsObject.h"
 #include "vm/SavedFrame.h"
+#include "wasm/WasmFrameIterator.h"
 
 struct JSCompartment;
 

js/src/wasm/AsmJS.cpp

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-#include "asmjs/AsmJS.h"
+#include "wasm/AsmJS.h"
 
 #include "mozilla/Attributes.h"
 #include "mozilla/Compression.h"
@@ -29,11 +29,6 @@
 
 #include "jswrapper.h"
 
-#include "asmjs/WasmBinaryFormat.h"
-#include "asmjs/WasmGenerator.h"
-#include "asmjs/WasmInstance.h"
-#include "asmjs/WasmJS.h"
-#include "asmjs/WasmSerialize.h"
 #include "builtin/SIMD.h"
 #include "frontend/Parser.h"
 #include "gc/Policy.h"
@@ -41,6 +36,11 @@
 #include "vm/StringBuffer.h"
 #include "vm/Time.h"
 #include "vm/TypedArrayObject.h"
+#include "wasm/WasmBinaryFormat.h"
+#include "wasm/WasmGenerator.h"
+#include "wasm/WasmInstance.h"
+#include "wasm/WasmJS.h"
+#include "wasm/WasmSerialize.h"
 
 #include "jsobjinlines.h"
 

js/src/wasm/WasmAST.h

@@ -19,11 +19,10 @@
 #ifndef wasmast_h
 #define wasmast_h
 
-#include "asmjs/WasmTypes.h"
-
 #include "ds/LifoAlloc.h"
 #include "js/HashTable.h"
 #include "js/Vector.h"
+#include "wasm/WasmTypes.h"
 
 namespace js {
 namespace wasm {

js/src/wasm/WasmBaselineCompile.cpp

@@ -93,14 +93,10 @@
  *   by the pre-block sync() call.)
  */
 
-#include "asmjs/WasmBaselineCompile.h"
+#include "wasm/WasmBaselineCompile.h"
 
 #include "mozilla/MathAlgorithms.h"
 
-#include "asmjs/WasmBinaryFormat.h"
-#include "asmjs/WasmBinaryIterator.h"
-#include "asmjs/WasmGenerator.h"
-#include "asmjs/WasmSignalHandlers.h"
 #include "jit/AtomicOp.h"
 #include "jit/IonTypes.h"
 #include "jit/JitAllocPolicy.h"
@@ -117,6 +113,11 @@
 # include "jit/x86-shared/Assembler-x86-shared.h"
 #endif
 
+#include "wasm/WasmBinaryFormat.h"
+#include "wasm/WasmBinaryIterator.h"
+#include "wasm/WasmGenerator.h"
+#include "wasm/WasmSignalHandlers.h"
+
 #include "jit/MacroAssembler-inl.h"
 
 using mozilla::DebugOnly;

js/src/wasm/WasmBaselineCompile.h

@@ -19,8 +19,8 @@
 #ifndef asmjs_wasm_baseline_compile_h
 #define asmjs_wasm_baseline_compile_h
 
-#include "asmjs/WasmBinary.h"
-#include "asmjs/WasmIonCompile.h"
+#include "wasm/WasmBinary.h"
+#include "wasm/WasmIonCompile.h"
 
 namespace js {
 namespace wasm {

js/src/wasm/WasmBinary.cpp

@@ -16,12 +16,12 @@
  * limitations under the License.
  */
 
-#include "asmjs/WasmBinary.h"
+#include "wasm/WasmBinary.h"
 
 #include <stdarg.h>
 
 #include "jsprf.h"
-#include "asmjs/WasmTypes.h"
+#include "wasm/WasmTypes.h"
 
 using namespace js;
 using namespace js::wasm;

js/src/wasm/WasmBinaryFormat.cpp

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-#include "asmjs/WasmBinaryFormat.h"
+#include "wasm/WasmBinaryFormat.h"
 
 #include "mozilla/CheckedInt.h"
 

js/src/wasm/WasmBinaryFormat.h

@@ -19,8 +19,8 @@
 #ifndef wasm_binary_format_h
 #define wasm_binary_format_h
 
-#include "asmjs/WasmBinary.h"
-#include "asmjs/WasmTypes.h"
+#include "wasm/WasmBinary.h"
+#include "wasm/WasmTypes.h"
 
 namespace js {
 namespace wasm {

js/src/wasm/WasmBinaryIterator.cpp

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-#include "asmjs/WasmBinaryIterator.h"
+#include "wasm/WasmBinaryIterator.h"
 
 using namespace js;
 using namespace js::jit;

js/src/wasm/WasmBinaryIterator.h

@@ -23,8 +23,8 @@
 
 #include "jsprf.h"
 
-#include "asmjs/WasmTypes.h"
 #include "jit/AtomicOp.h"
+#include "wasm/WasmTypes.h"
 
 namespace js {
 namespace wasm {

js/src/wasm/WasmBinaryToAST.cpp

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-#include "asmjs/WasmBinaryToAST.h"
+#include "wasm/WasmBinaryToAST.h"
 
 #include "mozilla/CheckedInt.h"
 #include "mozilla/MathAlgorithms.h"
@@ -24,8 +24,8 @@
 
 #include "jscntxt.h"
 
-#include "asmjs/WasmBinaryFormat.h"
-#include "asmjs/WasmBinaryIterator.h"
+#include "wasm/WasmBinaryFormat.h"
+#include "wasm/WasmBinaryIterator.h"
 
 using namespace js;
 using namespace js::wasm;

js/src/wasm/WasmBinaryToAST.h

@@ -19,11 +19,11 @@
 #ifndef wasmbinarytoast_h
 #define wasmbinarytoast_h
 
-#include "asmjs/WasmAST.h"
-#include "asmjs/WasmTypes.h"
-
 #include "ds/LifoAlloc.h"
 
+#include "wasm/WasmAST.h"
+#include "wasm/WasmTypes.h"
+
 namespace js {
 namespace wasm {
 

js/src/wasm/WasmBinaryToExperimentalText.cpp

@@ -16,19 +16,19 @@
  * limitations under the License.
  */
 
-#include "asmjs/WasmBinaryToExperimentalText.h"
+#include "wasm/WasmBinaryToExperimentalText.h"
 
 #include "mozilla/CheckedInt.h"
 
 #include "jsnum.h"
 #include "jsprf.h"
 
-#include "asmjs/WasmAST.h"
-#include "asmjs/WasmBinaryToAST.h"
-#include "asmjs/WasmTextUtils.h"
-#include "asmjs/WasmTypes.h"
 #include "vm/ArrayBufferObject.h"
 #include "vm/StringBuffer.h"
+#include "wasm/WasmAST.h"
+#include "wasm/WasmBinaryToAST.h"
+#include "wasm/WasmTextUtils.h"
+#include "wasm/WasmTypes.h"
 
 using namespace js;
 using namespace js::wasm;

js/src/wasm/WasmBinaryToExperimentalText.h

@@ -21,9 +21,9 @@
 
 #include "NamespaceImports.h"
 
-#include "asmjs/WasmGeneratedSourceMap.h"
 #include "gc/Rooting.h"
 #include "js/Class.h"
+#include "wasm/WasmGeneratedSourceMap.h"
 
 namespace js {
 

js/src/wasm/WasmBinaryToText.cpp

@@ -16,17 +16,17 @@
  * limitations under the License.
  */
 
-#include "asmjs/WasmBinaryToText.h"
+#include "wasm/WasmBinaryToText.h"
 
 #include "jsnum.h"
 #include "jsprf.h"
 
-#include "asmjs/WasmAST.h"
-#include "asmjs/WasmBinaryToAST.h"
-#include "asmjs/WasmTextUtils.h"
-#include "asmjs/WasmTypes.h"
 #include "vm/ArrayBufferObject.h"
 #include "vm/StringBuffer.h"
+#include "wasm/WasmAST.h"
+#include "wasm/WasmBinaryToAST.h"
+#include "wasm/WasmTextUtils.h"
+#include "wasm/WasmTypes.h"
 
 using namespace js;
 using namespace js::wasm;

js/src/wasm/WasmBinaryToText.h

@@ -21,9 +21,9 @@
 
 #include "NamespaceImports.h"
 
-#include "asmjs/WasmGeneratedSourceMap.h"
 #include "gc/Rooting.h"
 #include "js/Class.h"
+#include "wasm/WasmGeneratedSourceMap.h"
 
 namespace js {
 

js/src/wasm/WasmCode.cpp

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-#include "asmjs/WasmCode.h"
+#include "wasm/WasmCode.h"
 
 #include "mozilla/Atomics.h"
 #include "mozilla/BinarySearch.h"
@@ -24,9 +24,6 @@
 
 #include "jsprf.h"
 
-#include "asmjs/WasmBinaryToText.h"
-#include "asmjs/WasmModule.h"
-#include "asmjs/WasmSerialize.h"
 #include "jit/ExecutableAllocator.h"
 #include "jit/MacroAssembler.h"
 #ifdef JS_ION_PERF
@@ -36,6 +33,9 @@
 #ifdef MOZ_VTUNE
 # include "vtune/VTuneWrapper.h"
 #endif
+#include "wasm/WasmBinaryToText.h"
+#include "wasm/WasmModule.h"
+#include "wasm/WasmSerialize.h"
 
 #include "jit/MacroAssembler-inl.h"
 #include "vm/ArrayBufferObject-inl.h"

js/src/wasm/WasmCode.h

@@ -19,8 +19,8 @@
 #ifndef wasm_code_h
 #define wasm_code_h
 
-#include "asmjs/WasmGeneratedSourceMap.h"
-#include "asmjs/WasmTypes.h"
+#include "wasm/WasmGeneratedSourceMap.h"
+#include "wasm/WasmTypes.h"
 
 namespace js {
 

js/src/wasm/WasmCompartment.cpp

@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-#include "asmjs/WasmCompartment.h"
+#include "wasm/WasmCompartment.h"
 
 #include "jscompartment.h"
 
-#include "asmjs/WasmInstance.h"
+#include "wasm/WasmInstance.h"
 
 #include "vm/Debugger-inl.h"
 

js/src/wasm/WasmCompartment.h

@@ -19,7 +19,7 @@
 #ifndef wasm_compartment_h
 #define wasm_compartment_h
 
-#include "asmjs/WasmJS.h"
+#include "wasm/WasmJS.h"
 
 namespace js {
 

js/src/wasm/WasmCompile.cpp

@@ -16,14 +16,14 @@
  * limitations under the License.
  */
 
-#include "asmjs/WasmCompile.h"
+#include "wasm/WasmCompile.h"
 
 #include "jsprf.h"
 
-#include "asmjs/WasmBinaryFormat.h"
-#include "asmjs/WasmBinaryIterator.h"
-#include "asmjs/WasmGenerator.h"
-#include "asmjs/WasmSignalHandlers.h"
+#include "wasm/WasmBinaryFormat.h"
+#include "wasm/WasmBinaryIterator.h"
+#include "wasm/WasmGenerator.h"
+#include "wasm/WasmSignalHandlers.h"
 
 using namespace js;
 using namespace js::jit;

js/src/wasm/WasmCompile.h

@@ -19,8 +19,8 @@
 #ifndef wasm_compile_h
 #define wasm_compile_h
 
-#include "asmjs/WasmJS.h"
-#include "asmjs/WasmModule.h"
+#include "wasm/WasmJS.h"
+#include "wasm/WasmModule.h"
 
 namespace js {
 namespace wasm {

js/src/wasm/WasmFrameIterator.cpp

@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-#include "asmjs/WasmFrameIterator.h"
+#include "wasm/WasmFrameIterator.h"
 
-#include "asmjs/WasmInstance.h"
+#include "wasm/WasmInstance.h"
 
 #include "jit/MacroAssembler-inl.h"
 

js/src/wasm/WasmGenerator.cpp

@@ -16,16 +16,16 @@
  * limitations under the License.
  */
 
-#include "asmjs/WasmGenerator.h"
+#include "wasm/WasmGenerator.h"
 
 #include "mozilla/CheckedInt.h"
 #include "mozilla/EnumeratedRange.h"
 
 #include <algorithm>
 
-#include "asmjs/WasmBaselineCompile.h"
-#include "asmjs/WasmIonCompile.h"
-#include "asmjs/WasmStubs.h"
+#include "wasm/WasmBaselineCompile.h"
+#include "wasm/WasmIonCompile.h"
+#include "wasm/WasmStubs.h"
 
 #include "jit/MacroAssembler-inl.h"
 

js/src/wasm/WasmGenerator.h

@@ -19,10 +19,10 @@
 #ifndef wasm_generator_h
 #define wasm_generator_h
 
-#include "asmjs/WasmBinary.h"
-#include "asmjs/WasmCompile.h"
-#include "asmjs/WasmModule.h"
 #include "jit/MacroAssembler.h"
+#include "wasm/WasmBinary.h"
+#include "wasm/WasmCompile.h"
+#include "wasm/WasmModule.h"
 
 namespace js {
 namespace wasm {

js/src/wasm/WasmInstance.cpp

@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-#include "asmjs/WasmInstance.h"
+#include "wasm/WasmInstance.h"
 
-#include "asmjs/WasmModule.h"
 #include "jit/BaselineJIT.h"
 #include "jit/JitCommon.h"
+#include "wasm/WasmModule.h"
 
 #include "jsobjinlines.h"
 

js/src/wasm/WasmInstance.h

@@ -19,9 +19,9 @@
 #ifndef wasm_instance_h
 #define wasm_instance_h
 
-#include "asmjs/WasmCode.h"
-#include "asmjs/WasmTable.h"
 #include "gc/Barrier.h"
+#include "wasm/WasmCode.h"
+#include "wasm/WasmTable.h"
 
 namespace js {
 namespace wasm {

js/src/wasm/WasmIonCompile.cpp

@@ -16,18 +16,18 @@
  * limitations under the License.
  */
 
-#include "asmjs/WasmIonCompile.h"
+#include "wasm/WasmIonCompile.h"
 
 #include "mozilla/MathAlgorithms.h"
 
-#include "asmjs/WasmBaselineCompile.h"
-#include "asmjs/WasmBinaryFormat.h"
-#include "asmjs/WasmBinaryIterator.h"
-#include "asmjs/WasmGenerator.h"
-#include "asmjs/WasmSignalHandlers.h"
-
 #include "jit/CodeGenerator.h"
 
+#include "wasm/WasmBaselineCompile.h"
+#include "wasm/WasmBinaryFormat.h"
+#include "wasm/WasmBinaryIterator.h"
+#include "wasm/WasmGenerator.h"
+#include "wasm/WasmSignalHandlers.h"
+
 using namespace js;
 using namespace js::jit;
 using namespace js::wasm;

js/src/wasm/WasmIonCompile.h

@@ -19,8 +19,8 @@
 #ifndef wasm_ion_compile_h
 #define wasm_ion_compile_h
 
-#include "asmjs/WasmBinary.h"
 #include "jit/MacroAssembler.h"
+#include "wasm/WasmBinary.h"
 
 namespace js {
 namespace wasm {

js/src/wasm/WasmJS.cpp

@@ -16,20 +16,20 @@
  * limitations under the License.
  */
 
-#include "asmjs/WasmJS.h"
+#include "wasm/WasmJS.h"
 
 #include "mozilla/CheckedInt.h"
 #include "mozilla/Maybe.h"
 
 #include "jsprf.h"
 
-#include "asmjs/WasmCompile.h"
-#include "asmjs/WasmInstance.h"
-#include "asmjs/WasmModule.h"
-#include "asmjs/WasmSignalHandlers.h"
 #include "builtin/Promise.h"
 #include "jit/JitOptions.h"
 #include "vm/Interpreter.h"
+#include "wasm/WasmCompile.h"
+#include "wasm/WasmInstance.h"
+#include "wasm/WasmModule.h"
+#include "wasm/WasmSignalHandlers.h"
 
 #include "jsobjinlines.h"
 

js/src/wasm/WasmJS.h

@@ -19,9 +19,9 @@
 #ifndef wasm_js_h
 #define wasm_js_h
 
-#include "asmjs/WasmTypes.h"
 #include "gc/Policy.h"
 #include "vm/NativeObject.h"
+#include "wasm/WasmTypes.h"
 
 namespace js {
 

js/src/wasm/WasmModule.cpp

@@ -16,15 +16,15 @@
  * limitations under the License.
  */
 
-#include "asmjs/WasmModule.h"
+#include "wasm/WasmModule.h"
 
 #include "jsnspr.h"
 
-#include "asmjs/WasmCompile.h"
-#include "asmjs/WasmInstance.h"
-#include "asmjs/WasmJS.h"
-#include "asmjs/WasmSerialize.h"
 #include "jit/JitOptions.h"
+#include "wasm/WasmCompile.h"
+#include "wasm/WasmInstance.h"
+#include "wasm/WasmJS.h"
+#include "wasm/WasmSerialize.h"
 
 #include "jsatominlines.h"
 

js/src/wasm/WasmModule.h

@@ -19,10 +19,11 @@
 #ifndef wasm_module_h
 #define wasm_module_h
 
-#include "asmjs/WasmCode.h"
-#include "asmjs/WasmTable.h"
 #include "js/TypeDecls.h"
 
+#include "wasm/WasmCode.h"
+#include "wasm/WasmTable.h"
+
 namespace js {
 namespace wasm {
 

js/src/wasm/WasmSignalHandlers.cpp

@@ -16,15 +16,15 @@
  * limitations under the License.
  */
 
-#include "asmjs/WasmSignalHandlers.h"
+#include "wasm/WasmSignalHandlers.h"
 
 #include "mozilla/DebugOnly.h"
 #include "mozilla/PodOperations.h"
 
-#include "asmjs/WasmInstance.h"
 #include "jit/AtomicOperations.h"
 #include "jit/Disassembler.h"
 #include "vm/Runtime.h"
+#include "wasm/WasmInstance.h"
 
 using namespace js;
 using namespace js::jit;

js/src/wasm/WasmStubs.cpp

@@ -16,12 +16,12 @@
  * limitations under the License.
  */
 
-#include "asmjs/WasmStubs.h"
+#include "wasm/WasmStubs.h"
 
 #include "mozilla/ArrayUtils.h"
 
-#include "asmjs/WasmCode.h"
-#include "asmjs/WasmIonCompile.h"
+#include "wasm/WasmCode.h"
+#include "wasm/WasmIonCompile.h"
 
 #include "jit/MacroAssembler-inl.h"
 

js/src/wasm/WasmStubs.h

@@ -19,7 +19,7 @@
 #ifndef wasm_stubs_h
 #define wasm_stubs_h
 
-#include "asmjs/WasmTypes.h"
+#include "wasm/WasmTypes.h"
 
 namespace js {
 

js/src/wasm/WasmTable.cpp

@@ -16,14 +16,14 @@
  * limitations under the License.
  */
 
-#include "asmjs/WasmTable.h"
+#include "wasm/WasmTable.h"
 
 #include "mozilla/CheckedInt.h"
 
 #include "jscntxt.h"
 
-#include "asmjs/WasmInstance.h"
-#include "asmjs/WasmJS.h"
+#include "wasm/WasmInstance.h"
+#include "wasm/WasmJS.h"
 
 using namespace js;
 using namespace js::wasm;

js/src/wasm/WasmTable.h

@@ -19,8 +19,8 @@
 #ifndef wasm_table_h
 #define wasm_table_h
 
-#include "asmjs/WasmCode.h"
 #include "gc/Policy.h"
+#include "wasm/WasmCode.h"
 
 namespace js {
 namespace wasm {

js/src/wasm/WasmTextToBinary.cpp

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-#include "asmjs/WasmTextToBinary.h"
+#include "wasm/WasmTextToBinary.h"
 
 #include "mozilla/CheckedInt.h"
 #include "mozilla/MathAlgorithms.h"
@@ -27,12 +27,12 @@
 #include "jsprf.h"
 #include "jsstr.h"
 
-#include "asmjs/WasmAST.h"
-#include "asmjs/WasmBinaryFormat.h"
-#include "asmjs/WasmTypes.h"
 #include "ds/LifoAlloc.h"
 #include "js/CharacterEncoding.h"
 #include "js/HashTable.h"
+#include "wasm/WasmAST.h"
+#include "wasm/WasmBinaryFormat.h"
+#include "wasm/WasmTypes.h"
 
 using namespace js;
 using namespace js::wasm;

js/src/wasm/WasmTextToBinary.h

@@ -19,9 +19,10 @@
 #ifndef wasm_text_to_binary_h
 #define wasm_text_to_binary_h
 
-#include "asmjs/WasmBinary.h"
 #include "js/Utility.h"
 
+#include "wasm/WasmBinary.h"
+
 namespace js {
 namespace wasm {
 

js/src/wasm/WasmTextUtils.cpp

@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-#include "asmjs/WasmTextUtils.h"
+#include "wasm/WasmTextUtils.h"
 
-#include "asmjs/WasmBinary.h"
 #include "vm/StringBuffer.h"
+#include "wasm/WasmBinary.h"
 
 using namespace js;
 using namespace js::jit;

js/src/wasm/WasmTypes.cpp

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-#include "asmjs/WasmTypes.h"
+#include "wasm/WasmTypes.h"
 
 #include "mozilla/MathAlgorithms.h"
 
@@ -25,12 +25,12 @@
 #include "jslibmath.h"
 #include "jsmath.h"
 
-#include "asmjs/WasmInstance.h"
-#include "asmjs/WasmSerialize.h"
-#include "asmjs/WasmSignalHandlers.h"
 #include "jit/MacroAssembler.h"
 #include "js/Conversions.h"
 #include "vm/Interpreter.h"
+#include "wasm/WasmInstance.h"
+#include "wasm/WasmSerialize.h"
+#include "wasm/WasmSignalHandlers.h"
 
 #include "vm/Stack-inl.h"
 

js/src/wasm/WasmTypes.h

@@ -29,13 +29,13 @@
 
 #include "NamespaceImports.h"
 
-#include "asmjs/WasmBinary.h"
 #include "ds/LifoAlloc.h"
 #include "jit/IonTypes.h"
 #include "js/UniquePtr.h"
 #include "js/Utility.h"
 #include "js/Vector.h"
 #include "vm/MallocProvider.h"
+#include "wasm/WasmBinary.h"
 
 namespace js {