Rename WASM to Wasm

author keith_miller@apple.com <keith_miller@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>

Fri, 21 Oct 2016 19:14:20 +0000 (19:14 +0000)

committer keith_miller@apple.com <keith_miller@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>

Fri, 21 Oct 2016 19:14:20 +0000 (19:14 +0000)
author keith_miller@apple.com <keith_miller@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 21 Oct 2016 19:14:20 +0000 (19:14 +0000)
committer keith_miller@apple.com <keith_miller@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 21 Oct 2016 19:14:20 +0000 (19:14 +0000)
diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt

index 395fe2c..01cb294 100644 (file)
--- a/Source/JavaScriptCore/CMakeLists.txt
+++ b/Source/JavaScriptCore/CMakeLists.txt
@@ -861,13 +861,13 @@ set(JavaScriptCore_SOURCES
      tools/JSDollarVM.cpp
      tools/JSDollarVMPrototype.cpp
  
-    wasm/JSWASMModule.cpp
+    wasm/JSWasmModule.cpp
      wasm/JSWebAssembly.cpp
-    wasm/WASMB3IRGenerator.cpp
-    wasm/WASMCallingConvention.cpp
-    wasm/WASMMemory.cpp
-    wasm/WASMModuleParser.cpp
-    wasm/WASMPlan.cpp
+    wasm/WasmB3IRGenerator.cpp
+    wasm/WasmCallingConvention.cpp
+    wasm/WasmMemory.cpp
+    wasm/WasmModuleParser.cpp
+    wasm/WasmPlan.cpp
  
      wasm/js/JSWebAssemblyCompileError.cpp
      wasm/js/JSWebAssemblyInstance.cpp
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog

index c22f351..59a07f5 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,198 @@
+2016-10-21  Keith Miller  <keith_miller@apple.com>
+
+        Rename WASM to Wasm
+        https://bugs.webkit.org/show_bug.cgi?id=163796
+
+        Rubber stamped by Filip Pizlo.
+
+        * CMakeLists.txt:
+        * Configurations/ToolExecutable.xcconfig:
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * llint/LLIntThunks.cpp:
+        (JSC::vmEntryToWasm):
+        (JSC::vmEntryToWASM): Deleted.
+        * llint/LLIntThunks.h:
+        * runtime/Executable.cpp:
+        (JSC::WebAssemblyExecutable::WebAssemblyExecutable):
+        * runtime/Executable.h:
+        * shell/CMakeLists.txt:
+        * testWASM.cpp:
+        (runWASMTests): Deleted.
+        * testWasm.cpp: Renamed from Source/JavaScriptCore/testWASM.cpp.
+        (CommandLine::CommandLine):
+        (printUsageStatement):
+        (CommandLine::parseArguments):
+        (runLEBTests):
+        (invoke):
+        (box):
+        (runWasmTests):
+        (main):
+        * wasm/JSWASMModule.cpp:
+        (JSC::JSWASMModule::JSWASMModule): Deleted.
+        (JSC::JSWASMModule::destroy): Deleted.
+        (JSC::JSWASMModule::visitChildren): Deleted.
+        * wasm/JSWASMModule.h:
+        (JSC::JSWASMModule::create): Deleted.
+        (JSC::JSWASMModule::createStructure): Deleted.
+        (JSC::JSWASMModule::i32Constants): Deleted.
+        (JSC::JSWASMModule::f32Constants): Deleted.
+        (JSC::JSWASMModule::f64Constants): Deleted.
+        (JSC::JSWASMModule::signatures): Deleted.
+        (JSC::JSWASMModule::functionImports): Deleted.
+        (JSC::JSWASMModule::functionImportSignatures): Deleted.
+        (JSC::JSWASMModule::globalVariableTypes): Deleted.
+        (JSC::JSWASMModule::functionDeclarations): Deleted.
+        (JSC::JSWASMModule::functionPointerTables): Deleted.
+        (JSC::JSWASMModule::arrayBuffer): Deleted.
+        (JSC::JSWASMModule::functions): Deleted.
+        (JSC::JSWASMModule::functionStartOffsetsInSource): Deleted.
+        (JSC::JSWASMModule::functionStackHeights): Deleted.
+        (JSC::JSWASMModule::globalVariables): Deleted.
+        (JSC::JSWASMModule::importedFunctions): Deleted.
+        * wasm/JSWasmModule.cpp: Renamed from Source/JavaScriptCore/wasm/JSWASMModule.cpp.
+        (JSC::JSWasmModule::JSWasmModule):
+        (JSC::JSWasmModule::destroy):
+        (JSC::JSWasmModule::visitChildren):
+        * wasm/JSWasmModule.h: Renamed from Source/JavaScriptCore/wasm/JSWASMModule.h.
+        (JSC::JSWasmModule::create):
+        (JSC::JSWasmModule::createStructure):
+        (JSC::JSWasmModule::i32Constants):
+        (JSC::JSWasmModule::f32Constants):
+        (JSC::JSWasmModule::f64Constants):
+        (JSC::JSWasmModule::signatures):
+        (JSC::JSWasmModule::functionImports):
+        (JSC::JSWasmModule::functionImportSignatures):
+        (JSC::JSWasmModule::globalVariableTypes):
+        (JSC::JSWasmModule::functionDeclarations):
+        (JSC::JSWasmModule::functionPointerTables):
+        (JSC::JSWasmModule::arrayBuffer):
+        (JSC::JSWasmModule::functions):
+        (JSC::JSWasmModule::functionStartOffsetsInSource):
+        (JSC::JSWasmModule::functionStackHeights):
+        (JSC::JSWasmModule::globalVariables):
+        (JSC::JSWasmModule::importedFunctions):
+        * wasm/WASMB3IRGenerator.cpp:
+        (JSC::WASM::createJSWrapper): Deleted.
+        (JSC::WASM::parseAndCompile): Deleted.
+        * wasm/WASMCallingConvention.cpp:
+        (JSC::WASM::jscCallingConvention): Deleted.
+        (JSC::WASM::wasmCallingConvention): Deleted.
+        * wasm/WASMCallingConvention.h:
+        (JSC::WASM::CallingConvention::CallingConvention): Deleted.
+        (JSC::WASM::CallingConvention::marshallArgumentImpl): Deleted.
+        (JSC::WASM::CallingConvention::marshallArgument): Deleted.
+        (JSC::WASM::CallingConvention::loadArguments): Deleted.
+        (JSC::WASM::CallingConvention::setupCall): Deleted.
+        (JSC::WASM::nextJSCOffset): Deleted.
+        * wasm/WASMFormat.h:
+        (JSC::WASM::toB3Type): Deleted.
+        (JSC::WASM::isValueType): Deleted.
+        * wasm/WASMFunctionParser.h:
+        (JSC::WASM::FunctionParser<Context>::FunctionParser): Deleted.
+        (JSC::WASM::FunctionParser<Context>::parse): Deleted.
+        (JSC::WASM::FunctionParser<Context>::parseBlock): Deleted.
+        (JSC::WASM::FunctionParser<Context>::parseExpression): Deleted.
+        (JSC::WASM::FunctionParser<Context>::parseUnreachableExpression): Deleted.
+        * wasm/WASMMemory.cpp:
+        (JSC::WASM::Memory::Memory): Deleted.
+        * wasm/WASMMemory.h:
+        (JSC::WASM::Memory::~Memory): Deleted.
+        (JSC::WASM::Memory::memory): Deleted.
+        (JSC::WASM::Memory::size): Deleted.
+        (JSC::WASM::Memory::pinnedRegisters): Deleted.
+        (JSC::WASM::Memory::mode): Deleted.
+        (JSC::WASM::Memory::grow): Deleted.
+        (JSC::WASM::Memory::offsetOfSize): Deleted.
+        * wasm/WASMModuleParser.cpp:
+        (JSC::WASM::ModuleParser::parse): Deleted.
+        (JSC::WASM::ModuleParser::parseMemory): Deleted.
+        (JSC::WASM::ModuleParser::parseFunctionTypes): Deleted.
+        (JSC::WASM::ModuleParser::parseFunctionSignatures): Deleted.
+        (JSC::WASM::ModuleParser::parseFunctionDefinitions): Deleted.
+        * wasm/WASMModuleParser.h:
+        (JSC::WASM::ModuleParser::ModuleParser): Deleted.
+        (JSC::WASM::ModuleParser::functionInformation): Deleted.
+        (JSC::WASM::ModuleParser::memory): Deleted.
+        * wasm/WASMOps.h:
+        (JSC::WASM::isValidOpType): Deleted.
+        (JSC::WASM::isControlOp): Deleted.
+        * wasm/WASMParser.h:
+        (JSC::WASM::Parser::parseVarUInt32): Deleted.
+        (JSC::WASM::Parser::parseVarUInt64): Deleted.
+        (JSC::WASM::Parser::Parser): Deleted.
+        (JSC::WASM::Parser::consumeCharacter): Deleted.
+        (JSC::WASM::Parser::consumeString): Deleted.
+        (JSC::WASM::Parser::parseUInt32): Deleted.
+        (JSC::WASM::Parser::parseUInt7): Deleted.
+        (JSC::WASM::Parser::parseVarUInt1): Deleted.
+        (JSC::WASM::Parser::parseValueType): Deleted.
+        * wasm/WASMPlan.cpp:
+        (JSC::WASM::Plan::Plan): Deleted.
+        * wasm/WASMSections.h:
+        (JSC::WASM::Sections::validateOrder): Deleted.
+        * wasm/WasmB3IRGenerator.cpp: Renamed from Source/JavaScriptCore/wasm/WASMB3IRGenerator.cpp.
+        (dumpProcedure):
+        (JSC::Wasm::createJSWrapper):
+        (JSC::Wasm::parseAndCompile):
+        * wasm/WasmB3IRGenerator.h: Renamed from Source/JavaScriptCore/wasm/WASMB3IRGenerator.h.
+        * wasm/WasmCallingConvention.cpp: Renamed from Source/JavaScriptCore/wasm/WASMCallingConvention.cpp.
+        (JSC::Wasm::jscCallingConvention):
+        (JSC::Wasm::wasmCallingConvention):
+        * wasm/WasmCallingConvention.h: Renamed from Source/JavaScriptCore/wasm/WASMCallingConvention.h.
+        (JSC::Wasm::CallingConvention::CallingConvention):
+        (JSC::Wasm::CallingConvention::marshallArgumentImpl):
+        (JSC::Wasm::CallingConvention::marshallArgument):
+        (JSC::Wasm::CallingConvention::loadArguments):
+        (JSC::Wasm::CallingConvention::setupCall):
+        (JSC::Wasm::nextJSCOffset):
+        * wasm/WasmFormat.h: Renamed from Source/JavaScriptCore/wasm/WASMFormat.h.
+        (JSC::Wasm::toB3Type):
+        (JSC::Wasm::isValueType):
+        * wasm/WasmFunctionParser.h: Renamed from Source/JavaScriptCore/wasm/WASMFunctionParser.h.
+        (JSC::Wasm::FunctionParser<Context>::FunctionParser):
+        (JSC::Wasm::FunctionParser<Context>::parse):
+        (JSC::Wasm::FunctionParser<Context>::parseBlock):
+        (JSC::Wasm::FunctionParser<Context>::parseExpression):
+        (JSC::Wasm::FunctionParser<Context>::parseUnreachableExpression):
+        * wasm/WasmMemory.cpp: Renamed from Source/JavaScriptCore/wasm/WASMMemory.cpp.
+        (JSC::Wasm::Memory::Memory):
+        * wasm/WasmMemory.h: Renamed from Source/JavaScriptCore/wasm/WASMMemory.h.
+        (JSC::Wasm::Memory::~Memory):
+        (JSC::Wasm::Memory::memory):
+        (JSC::Wasm::Memory::size):
+        (JSC::Wasm::Memory::pinnedRegisters):
+        (JSC::Wasm::Memory::mode):
+        (JSC::Wasm::Memory::grow):
+        (JSC::Wasm::Memory::offsetOfSize):
+        * wasm/WasmModuleParser.cpp: Renamed from Source/JavaScriptCore/wasm/WASMModuleParser.cpp.
+        (JSC::Wasm::ModuleParser::parse):
+        (JSC::Wasm::ModuleParser::parseMemory):
+        (JSC::Wasm::ModuleParser::parseFunctionTypes):
+        (JSC::Wasm::ModuleParser::parseFunctionSignatures):
+        (JSC::Wasm::ModuleParser::parseFunctionDefinitions):
+        * wasm/WasmModuleParser.h: Renamed from Source/JavaScriptCore/wasm/WASMModuleParser.h.
+        (JSC::Wasm::ModuleParser::ModuleParser):
+        (JSC::Wasm::ModuleParser::functionInformation):
+        (JSC::Wasm::ModuleParser::memory):
+        * wasm/WasmOps.h: Renamed from Source/JavaScriptCore/wasm/WASMOps.h.
+        (JSC::Wasm::isValidOpType):
+        (JSC::Wasm::isControlOp):
+        * wasm/WasmParser.h: Renamed from Source/JavaScriptCore/wasm/WASMParser.h.
+        (JSC::Wasm::Parser::parseVarUInt32):
+        (JSC::Wasm::Parser::parseVarUInt64):
+        (JSC::Wasm::Parser::Parser):
+        (JSC::Wasm::Parser::consumeCharacter):
+        (JSC::Wasm::Parser::consumeString):
+        (JSC::Wasm::Parser::parseUInt32):
+        (JSC::Wasm::Parser::parseUInt7):
+        (JSC::Wasm::Parser::parseVarUInt1):
+        (JSC::Wasm::Parser::parseValueType):
+        * wasm/WasmPlan.cpp: Renamed from Source/JavaScriptCore/wasm/WASMPlan.cpp.
+        (JSC::Wasm::Plan::Plan):
+        * wasm/WasmPlan.h: Renamed from Source/JavaScriptCore/wasm/WASMPlan.h.
+        * wasm/WasmSections.h: Renamed from Source/JavaScriptCore/wasm/WASMSections.h.
+        (JSC::Wasm::Sections::validateOrder):
+
  2016-10-21  Caitlin Potter  <caitp@igalia.com>
  
          [JSC] don't crash when arguments to `new Function()` produce unexpected AST
diff --git a/Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig b/Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig

index 7171833..a1a90ba 100644 (file)
--- a/Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig
+++ b/Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig
@@ -31,7 +31,7 @@ CODE_SIGN_ENTITLEMENTS_ios_minidom = entitlements.plist;
  CODE_SIGN_ENTITLEMENTS_ios_testair = entitlements.plist;
  CODE_SIGN_ENTITLEMENTS_ios_testapi = entitlements.plist;
  CODE_SIGN_ENTITLEMENTS_ios_testb3 = entitlements.plist;
-CODE_SIGN_ENTITLEMENTS_ios_testWASM = entitlements.plist;
+CODE_SIGN_ENTITLEMENTS_ios_testWasm = entitlements.plist;
  CODE_SIGN_ENTITLEMENTS_ios_testRegExp = entitlements.plist;
  
  SKIP_INSTALL = $(SKIP_INSTALL_$(FORCE_TOOL_INSTALL));
diff --git a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

index fd42b9c..86aa084 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
+++ b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
@@ -1209,8 +1209,8 @@
                 52C0611F1AA51E1C00B4ADBA /* RuntimeType.h in Headers */ = {isa = PBXBuildFile; fileRef = 52C0611D1AA51E1B00B4ADBA /* RuntimeType.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 52C952B719A289850069B386 /* TypeProfiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 52C952B619A289850069B386 /* TypeProfiler.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 52C952B919A28A1C0069B386 /* TypeProfiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 52C952B819A28A1C0069B386 /* TypeProfiler.cpp */; };
-               531374BD1D5CE67600AF7A0B /* WASMPlan.h in Headers */ = {isa = PBXBuildFile; fileRef = 531374BC1D5CE67600AF7A0B /* WASMPlan.h */; };
-               531374BF1D5CE95000AF7A0B /* WASMPlan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 531374BE1D5CE95000AF7A0B /* WASMPlan.cpp */; };
+               531374BD1D5CE67600AF7A0B /* WasmPlan.h in Headers */ = {isa = PBXBuildFile; fileRef = 531374BC1D5CE67600AF7A0B /* WasmPlan.h */; };
+               531374BF1D5CE95000AF7A0B /* WasmPlan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 531374BE1D5CE95000AF7A0B /* WasmPlan.cpp */; };
                 5341FC701DAC33E500E7E4D7 /* B3WasmBoundsCheckValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5341FC6F1DAC33E500E7E4D7 /* B3WasmBoundsCheckValue.cpp */; };
                 5341FC721DAC343C00E7E4D7 /* B3WasmBoundsCheckValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 5341FC711DAC343C00E7E4D7 /* B3WasmBoundsCheckValue.h */; };
                 53486BB71C1795C300F6F3AF /* JSTypedArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 53486BB61C1795C300F6F3AF /* JSTypedArray.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1219,30 +1219,30 @@
                 534C457C1BC72411007476A7 /* JSTypedArrayViewConstructor.h in Headers */ = {isa = PBXBuildFile; fileRef = 534C457B1BC72411007476A7 /* JSTypedArrayViewConstructor.h */; };
                 534C457E1BC72549007476A7 /* JSTypedArrayViewConstructor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 534C457D1BC72549007476A7 /* JSTypedArrayViewConstructor.cpp */; };
                 53529A4C1C457B75000B49C6 /* APIUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 53529A4B1C457B75000B49C6 /* APIUtils.h */; };
-               535557141D9D9EA5006D583B /* WASMMemory.h in Headers */ = {isa = PBXBuildFile; fileRef = 535557131D9D9EA5006D583B /* WASMMemory.h */; };
-               535557161D9DFA32006D583B /* WASMMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 535557151D9DFA32006D583B /* WASMMemory.cpp */; };
+               535557141D9D9EA5006D583B /* WasmMemory.h in Headers */ = {isa = PBXBuildFile; fileRef = 535557131D9D9EA5006D583B /* WasmMemory.h */; };
+               535557161D9DFA32006D583B /* WasmMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 535557151D9DFA32006D583B /* WasmMemory.cpp */; };
                 5370B4F51BF26202005C40FC /* AdaptiveInferredPropertyValueWatchpointBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5370B4F31BF25EA2005C40FC /* AdaptiveInferredPropertyValueWatchpointBase.cpp */; };
                 5370B4F61BF26205005C40FC /* AdaptiveInferredPropertyValueWatchpointBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 5370B4F41BF25EA2005C40FC /* AdaptiveInferredPropertyValueWatchpointBase.h */; };
                 53917E7B1B7906FA000EBD33 /* JSGenericTypedArrayViewPrototypeFunctions.h in Headers */ = {isa = PBXBuildFile; fileRef = 53917E7A1B7906E4000EBD33 /* JSGenericTypedArrayViewPrototypeFunctions.h */; };
                 539EB0791D55607000C82EF7 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51F0EB6105C86C6B00E6DF1B /* Foundation.framework */; };
                 539EB07A1D55607000C82EF7 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 932F5BD90822A1C700736975 /* JavaScriptCore.framework */; };
-               539EB0811D55608A00C82EF7 /* testWASM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 539EB0711D553DF800C82EF7 /* testWASM.cpp */; };
+               539EB0811D55608A00C82EF7 /* testWasm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 539EB0711D553DF800C82EF7 /* testWasm.cpp */; };
                 539FB8BA1C99DA7C00940FA1 /* JSArrayInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = 539FB8B91C99DA7C00940FA1 /* JSArrayInlines.h */; };
                 53D444DC1DAF08AB00B92784 /* B3WasmAddressValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 53D444DB1DAF08AB00B92784 /* B3WasmAddressValue.h */; };
                 53D444DE1DAF09A000B92784 /* B3WasmAddressValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53D444DD1DAF09A000B92784 /* B3WasmAddressValue.cpp */; };
-               53F40E851D58F9770099A1B6 /* WASMSections.h in Headers */ = {isa = PBXBuildFile; fileRef = 53F40E841D58F9770099A1B6 /* WASMSections.h */; };
-               53F40E8B1D5901BB0099A1B6 /* WASMFunctionParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 53F40E8A1D5901BB0099A1B6 /* WASMFunctionParser.h */; };
-               53F40E8D1D5901F20099A1B6 /* WASMParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 53F40E8C1D5901F20099A1B6 /* WASMParser.h */; };
-               53F40E8F1D5902820099A1B6 /* WASMB3IRGenerator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53F40E8E1D5902820099A1B6 /* WASMB3IRGenerator.cpp */; };
-               53F40E911D5903020099A1B6 /* WASMOps.h in Headers */ = {isa = PBXBuildFile; fileRef = 53F40E901D5903020099A1B6 /* WASMOps.h */; };
-               53F40E931D5A4AB30099A1B6 /* WASMB3IRGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = 53F40E921D5A4AB30099A1B6 /* WASMB3IRGenerator.h */; };
-               53F40E951D5A7AEF0099A1B6 /* WASMModuleParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 53F40E941D5A7AEF0099A1B6 /* WASMModuleParser.h */; };
-               53F40E971D5A7BEC0099A1B6 /* WASMModuleParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53F40E961D5A7BEC0099A1B6 /* WASMModuleParser.cpp */; };
+               53F40E851D58F9770099A1B6 /* WasmSections.h in Headers */ = {isa = PBXBuildFile; fileRef = 53F40E841D58F9770099A1B6 /* WasmSections.h */; };
+               53F40E8B1D5901BB0099A1B6 /* WasmFunctionParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 53F40E8A1D5901BB0099A1B6 /* WasmFunctionParser.h */; };
+               53F40E8D1D5901F20099A1B6 /* WasmParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 53F40E8C1D5901F20099A1B6 /* WasmParser.h */; };
+               53F40E8F1D5902820099A1B6 /* WasmB3IRGenerator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53F40E8E1D5902820099A1B6 /* WasmB3IRGenerator.cpp */; };
+               53F40E911D5903020099A1B6 /* WasmOps.h in Headers */ = {isa = PBXBuildFile; fileRef = 53F40E901D5903020099A1B6 /* WasmOps.h */; };
+               53F40E931D5A4AB30099A1B6 /* WasmB3IRGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = 53F40E921D5A4AB30099A1B6 /* WasmB3IRGenerator.h */; };
+               53F40E951D5A7AEF0099A1B6 /* WasmModuleParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 53F40E941D5A7AEF0099A1B6 /* WasmModuleParser.h */; };
+               53F40E971D5A7BEC0099A1B6 /* WasmModuleParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53F40E961D5A7BEC0099A1B6 /* WasmModuleParser.cpp */; };
                 53F6BF6D1C3F060A00F41E5D /* InternalFunctionAllocationProfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 53F6BF6C1C3F060A00F41E5D /* InternalFunctionAllocationProfile.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 53FA2AE11CF37F3F0022711D /* LLIntPrototypeLoadAdaptiveStructureWatchpoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 53FA2AE01CF37F3F0022711D /* LLIntPrototypeLoadAdaptiveStructureWatchpoint.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 53FA2AE31CF380390022711D /* LLIntPrototypeLoadAdaptiveStructureWatchpoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53FA2AE21CF380390022711D /* LLIntPrototypeLoadAdaptiveStructureWatchpoint.cpp */; };
-               53FD04D31D7AB277003287D3 /* WASMCallingConvention.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53FD04D11D7AB187003287D3 /* WASMCallingConvention.cpp */; };
-               53FD04D41D7AB291003287D3 /* WASMCallingConvention.h in Headers */ = {isa = PBXBuildFile; fileRef = 53FD04D21D7AB187003287D3 /* WASMCallingConvention.h */; };
+               53FD04D31D7AB277003287D3 /* WasmCallingConvention.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53FD04D11D7AB187003287D3 /* WasmCallingConvention.cpp */; };
+               53FD04D41D7AB291003287D3 /* WasmCallingConvention.h in Headers */ = {isa = PBXBuildFile; fileRef = 53FD04D21D7AB187003287D3 /* WasmCallingConvention.h */; };
                 5D5D8AD10E0D0EBE00F9C692 /* libedit.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D5D8AD00E0D0EBE00F9C692 /* libedit.dylib */; };
                 5DBB151B131D0B310056AD36 /* testapi.js in Copy Support Script */ = {isa = PBXBuildFile; fileRef = 14D857740A4696C80032146C /* testapi.js */; };
                 5DBB1525131D0BD70056AD36 /* minidom.js in Copy Support Script */ = {isa = PBXBuildFile; fileRef = 1412110D0A48788700480255 /* minidom.js */; };
@@ -1365,9 +1365,9 @@
                 79EE0C001B4AFB85000385C9 /* VariableEnvironment.h in Headers */ = {isa = PBXBuildFile; fileRef = 79EE0BFE1B4AFB85000385C9 /* VariableEnvironment.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 79F8FC1E1B9FED0F00CA66AB /* DFGMaximalFlushInsertionPhase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 79F8FC1C1B9FED0F00CA66AB /* DFGMaximalFlushInsertionPhase.cpp */; };
                 79F8FC1F1B9FED0F00CA66AB /* DFGMaximalFlushInsertionPhase.h in Headers */ = {isa = PBXBuildFile; fileRef = 79F8FC1D1B9FED0F00CA66AB /* DFGMaximalFlushInsertionPhase.h */; };
-               7B98D1361B60CD5F0023B1A4 /* JSWASMModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B98D1341B60CD5A0023B1A4 /* JSWASMModule.cpp */; };
-               7B98D1371B60CD620023B1A4 /* JSWASMModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B98D1351B60CD5A0023B1A4 /* JSWASMModule.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               7BC547D31B6959A100959B58 /* WASMFormat.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BC547D21B69599B00959B58 /* WASMFormat.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               7B98D1361B60CD5F0023B1A4 /* JSWasmModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B98D1341B60CD5A0023B1A4 /* JSWasmModule.cpp */; };
+               7B98D1371B60CD620023B1A4 /* JSWasmModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B98D1351B60CD5A0023B1A4 /* JSWasmModule.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               7BC547D31B6959A100959B58 /* WasmFormat.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BC547D21B69599B00959B58 /* WasmFormat.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 7C008CDA187124BB00955C24 /* JSPromiseDeferred.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C008CD8187124BB00955C24 /* JSPromiseDeferred.cpp */; };
                 7C008CDB187124BB00955C24 /* JSPromiseDeferred.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C008CD9187124BB00955C24 /* JSPromiseDeferred.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 7C008CE7187631B600955C24 /* Microtask.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C008CE5187631B600955C24 /* Microtask.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -3510,8 +3510,8 @@
                 52C0611D1AA51E1B00B4ADBA /* RuntimeType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RuntimeType.h; sourceTree = "<group>"; };
                 52C952B619A289850069B386 /* TypeProfiler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TypeProfiler.h; sourceTree = "<group>"; };
                 52C952B819A28A1C0069B386 /* TypeProfiler.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TypeProfiler.cpp; sourceTree = "<group>"; };
-               531374BC1D5CE67600AF7A0B /* WASMPlan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WASMPlan.h; sourceTree = "<group>"; };
-               531374BE1D5CE95000AF7A0B /* WASMPlan.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WASMPlan.cpp; sourceTree = "<group>"; };
+               531374BC1D5CE67600AF7A0B /* WasmPlan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WasmPlan.h; sourceTree = "<group>"; };
+               531374BE1D5CE95000AF7A0B /* WasmPlan.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WasmPlan.cpp; sourceTree = "<group>"; };
                 5341FC6F1DAC33E500E7E4D7 /* B3WasmBoundsCheckValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = B3WasmBoundsCheckValue.cpp; path = b3/B3WasmBoundsCheckValue.cpp; sourceTree = "<group>"; };
                 5341FC711DAC343C00E7E4D7 /* B3WasmBoundsCheckValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = B3WasmBoundsCheckValue.h; path = b3/B3WasmBoundsCheckValue.h; sourceTree = "<group>"; };
                 53486BB61C1795C300F6F3AF /* JSTypedArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSTypedArray.h; sourceTree = "<group>"; };
@@ -3522,32 +3522,32 @@
                 534C457B1BC72411007476A7 /* JSTypedArrayViewConstructor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSTypedArrayViewConstructor.h; sourceTree = "<group>"; };
                 534C457D1BC72549007476A7 /* JSTypedArrayViewConstructor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTypedArrayViewConstructor.cpp; sourceTree = "<group>"; };
                 53529A4B1C457B75000B49C6 /* APIUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIUtils.h; sourceTree = "<group>"; };
-               535557131D9D9EA5006D583B /* WASMMemory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WASMMemory.h; sourceTree = "<group>"; };
-               535557151D9DFA32006D583B /* WASMMemory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WASMMemory.cpp; sourceTree = "<group>"; };
+               535557131D9D9EA5006D583B /* WasmMemory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WasmMemory.h; sourceTree = "<group>"; };
+               535557151D9DFA32006D583B /* WasmMemory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WasmMemory.cpp; sourceTree = "<group>"; };
                 5370B4F31BF25EA2005C40FC /* AdaptiveInferredPropertyValueWatchpointBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AdaptiveInferredPropertyValueWatchpointBase.cpp; sourceTree = "<group>"; };
                 5370B4F41BF25EA2005C40FC /* AdaptiveInferredPropertyValueWatchpointBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AdaptiveInferredPropertyValueWatchpointBase.h; sourceTree = "<group>"; };
                 53917E7A1B7906E4000EBD33 /* JSGenericTypedArrayViewPrototypeFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSGenericTypedArrayViewPrototypeFunctions.h; sourceTree = "<group>"; };
                 53917E7C1B791106000EBD33 /* JSTypedArrayViewPrototype.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSTypedArrayViewPrototype.h; sourceTree = "<group>"; };
                 53917E831B791CB8000EBD33 /* TypedArrayPrototype.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = TypedArrayPrototype.js; path = builtins/TypedArrayPrototype.js; sourceTree = SOURCE_ROOT; };
-               539EB0711D553DF800C82EF7 /* testWASM.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = testWASM.cpp; sourceTree = "<group>"; };
+               539EB0711D553DF800C82EF7 /* testWasm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = testWasm.cpp; sourceTree = "<group>"; };
                 539EB0801D55607000C82EF7 /* testWASM */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testWASM; sourceTree = BUILT_PRODUCTS_DIR; };
                 539FB8B91C99DA7C00940FA1 /* JSArrayInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSArrayInlines.h; sourceTree = "<group>"; };
                 53D444DB1DAF08AB00B92784 /* B3WasmAddressValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = B3WasmAddressValue.h; path = b3/B3WasmAddressValue.h; sourceTree = "<group>"; };
                 53D444DD1DAF09A000B92784 /* B3WasmAddressValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = B3WasmAddressValue.cpp; path = b3/B3WasmAddressValue.cpp; sourceTree = "<group>"; };
                 53F256E11B87E28000B4B768 /* JSTypedArrayViewPrototype.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTypedArrayViewPrototype.cpp; sourceTree = "<group>"; };
-               53F40E841D58F9770099A1B6 /* WASMSections.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WASMSections.h; sourceTree = "<group>"; };
-               53F40E8A1D5901BB0099A1B6 /* WASMFunctionParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WASMFunctionParser.h; sourceTree = "<group>"; };
-               53F40E8C1D5901F20099A1B6 /* WASMParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WASMParser.h; sourceTree = "<group>"; };
-               53F40E8E1D5902820099A1B6 /* WASMB3IRGenerator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WASMB3IRGenerator.cpp; sourceTree = "<group>"; };
-               53F40E901D5903020099A1B6 /* WASMOps.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WASMOps.h; sourceTree = "<group>"; };
-               53F40E921D5A4AB30099A1B6 /* WASMB3IRGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WASMB3IRGenerator.h; sourceTree = "<group>"; };
-               53F40E941D5A7AEF0099A1B6 /* WASMModuleParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WASMModuleParser.h; sourceTree = "<group>"; };
-               53F40E961D5A7BEC0099A1B6 /* WASMModuleParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WASMModuleParser.cpp; sourceTree = "<group>"; };
+               53F40E841D58F9770099A1B6 /* WasmSections.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WasmSections.h; sourceTree = "<group>"; };
+               53F40E8A1D5901BB0099A1B6 /* WasmFunctionParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WasmFunctionParser.h; sourceTree = "<group>"; };
+               53F40E8C1D5901F20099A1B6 /* WasmParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WasmParser.h; sourceTree = "<group>"; };
+               53F40E8E1D5902820099A1B6 /* WasmB3IRGenerator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WasmB3IRGenerator.cpp; sourceTree = "<group>"; };
+               53F40E901D5903020099A1B6 /* WasmOps.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WasmOps.h; sourceTree = "<group>"; };
+               53F40E921D5A4AB30099A1B6 /* WasmB3IRGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WasmB3IRGenerator.h; sourceTree = "<group>"; };
+               53F40E941D5A7AEF0099A1B6 /* WasmModuleParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WasmModuleParser.h; sourceTree = "<group>"; };
+               53F40E961D5A7BEC0099A1B6 /* WasmModuleParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WasmModuleParser.cpp; sourceTree = "<group>"; };
                 53F6BF6C1C3F060A00F41E5D /* InternalFunctionAllocationProfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InternalFunctionAllocationProfile.h; sourceTree = "<group>"; };
                 53FA2AE01CF37F3F0022711D /* LLIntPrototypeLoadAdaptiveStructureWatchpoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LLIntPrototypeLoadAdaptiveStructureWatchpoint.h; sourceTree = "<group>"; };
                 53FA2AE21CF380390022711D /* LLIntPrototypeLoadAdaptiveStructureWatchpoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LLIntPrototypeLoadAdaptiveStructureWatchpoint.cpp; sourceTree = "<group>"; };
-               53FD04D11D7AB187003287D3 /* WASMCallingConvention.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WASMCallingConvention.cpp; sourceTree = "<group>"; };
-               53FD04D21D7AB187003287D3 /* WASMCallingConvention.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WASMCallingConvention.h; sourceTree = "<group>"; };
+               53FD04D11D7AB187003287D3 /* WasmCallingConvention.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WasmCallingConvention.cpp; sourceTree = "<group>"; };
+               53FD04D21D7AB187003287D3 /* WasmCallingConvention.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WasmCallingConvention.h; sourceTree = "<group>"; };
                 5D5D8AD00E0D0EBE00F9C692 /* libedit.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libedit.dylib; path = /usr/lib/libedit.dylib; sourceTree = "<absolute>"; };
                 5DAFD6CB146B686300FBEFB4 /* JSC.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = JSC.xcconfig; sourceTree = "<group>"; };
                 5DDDF44614FEE72200B4FB4D /* LLIntDesiredOffsets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LLIntDesiredOffsets.h; path = LLIntOffsets/LLIntDesiredOffsets.h; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -3706,9 +3706,9 @@
                 79EE0BFE1B4AFB85000385C9 /* VariableEnvironment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VariableEnvironment.h; sourceTree = "<group>"; };
                 79F8FC1C1B9FED0F00CA66AB /* DFGMaximalFlushInsertionPhase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGMaximalFlushInsertionPhase.cpp; path = dfg/DFGMaximalFlushInsertionPhase.cpp; sourceTree = "<group>"; };
                 79F8FC1D1B9FED0F00CA66AB /* DFGMaximalFlushInsertionPhase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGMaximalFlushInsertionPhase.h; path = dfg/DFGMaximalFlushInsertionPhase.h; sourceTree = "<group>"; };
-               7B98D1341B60CD5A0023B1A4 /* JSWASMModule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWASMModule.cpp; sourceTree = "<group>"; };
-               7B98D1351B60CD5A0023B1A4 /* JSWASMModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWASMModule.h; sourceTree = "<group>"; };
-               7BC547D21B69599B00959B58 /* WASMFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WASMFormat.h; sourceTree = "<group>"; };
+               7B98D1341B60CD5A0023B1A4 /* JSWasmModule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWasmModule.cpp; sourceTree = "<group>"; };
+               7B98D1351B60CD5A0023B1A4 /* JSWasmModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWasmModule.h; sourceTree = "<group>"; };
+               7BC547D21B69599B00959B58 /* WasmFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WasmFormat.h; sourceTree = "<group>"; };
                 7C008CD8187124BB00955C24 /* JSPromiseDeferred.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPromiseDeferred.cpp; sourceTree = "<group>"; };
                 7C008CD9187124BB00955C24 /* JSPromiseDeferred.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSPromiseDeferred.h; sourceTree = "<group>"; };
                 7C008CE5187631B600955C24 /* Microtask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Microtask.h; sourceTree = "<group>"; };
@@ -5295,7 +5295,7 @@
                                 FECB8B291D25CABB006F2463 /* testapi-function-overrides.js */,
                                 86D22219167EF9440024C804 /* testapi.mm */,
                                 651122E5140469BA002B101D /* testRegExp.cpp */,
-                               539EB0711D553DF800C82EF7 /* testWASM.cpp */,
+                               539EB0711D553DF800C82EF7 /* testWasm.cpp */,
                         );
                         name = tests;
                         sourceTree = "<group>";
@@ -5819,23 +5819,23 @@
                                 AD2FCC2E1DB839F700B3E736 /* JSWebAssembly.cpp */,
                                 AD2FCC2F1DB839F700B3E736 /* JSWebAssembly.h */,
                                 AD2FCB8A1DB5840000B3E736 /* js */,
-                               7B98D1341B60CD5A0023B1A4 /* JSWASMModule.cpp */,
-                               7B98D1351B60CD5A0023B1A4 /* JSWASMModule.h */,
-                               53F40E8E1D5902820099A1B6 /* WASMB3IRGenerator.cpp */,
-                               53F40E921D5A4AB30099A1B6 /* WASMB3IRGenerator.h */,
-                               53FD04D11D7AB187003287D3 /* WASMCallingConvention.cpp */,
-                               53FD04D21D7AB187003287D3 /* WASMCallingConvention.h */,
-                               53F40E901D5903020099A1B6 /* WASMOps.h */,
-                               7BC547D21B69599B00959B58 /* WASMFormat.h */,
-                               53F40E8A1D5901BB0099A1B6 /* WASMFunctionParser.h */,
-                               535557151D9DFA32006D583B /* WASMMemory.cpp */,
-                               535557131D9D9EA5006D583B /* WASMMemory.h */,
-                               53F40E961D5A7BEC0099A1B6 /* WASMModuleParser.cpp */,
-                               53F40E941D5A7AEF0099A1B6 /* WASMModuleParser.h */,
-                               531374BE1D5CE95000AF7A0B /* WASMPlan.cpp */,
-                               531374BC1D5CE67600AF7A0B /* WASMPlan.h */,
-                               53F40E8C1D5901F20099A1B6 /* WASMParser.h */,
-                               53F40E841D58F9770099A1B6 /* WASMSections.h */,
+                               7B98D1341B60CD5A0023B1A4 /* JSWasmModule.cpp */,
+                               7B98D1351B60CD5A0023B1A4 /* JSWasmModule.h */,
+                               53F40E8E1D5902820099A1B6 /* WasmB3IRGenerator.cpp */,
+                               53F40E921D5A4AB30099A1B6 /* WasmB3IRGenerator.h */,
+                               53FD04D11D7AB187003287D3 /* WasmCallingConvention.cpp */,
+                               53FD04D21D7AB187003287D3 /* WasmCallingConvention.h */,
+                               53F40E901D5903020099A1B6 /* WasmOps.h */,
+                               7BC547D21B69599B00959B58 /* WasmFormat.h */,
+                               53F40E8A1D5901BB0099A1B6 /* WasmFunctionParser.h */,
+                               535557151D9DFA32006D583B /* WasmMemory.cpp */,
+                               535557131D9D9EA5006D583B /* WasmMemory.h */,
+                               53F40E961D5A7BEC0099A1B6 /* WasmModuleParser.cpp */,
+                               53F40E941D5A7AEF0099A1B6 /* WasmModuleParser.h */,
+                               531374BE1D5CE95000AF7A0B /* WasmPlan.cpp */,
+                               531374BC1D5CE67600AF7A0B /* WasmPlan.h */,
+                               53F40E8C1D5901F20099A1B6 /* WasmParser.h */,
+                               53F40E841D58F9770099A1B6 /* WasmSections.h */,
                         );
                         path = wasm;
                         sourceTree = "<group>";
@@ -7603,7 +7603,7 @@
                                 0F4C91661C29F4F2004341A6 /* B3OriginDump.h in Headers */,
                                 C2FCAE1317A9C24E0034C735 /* BytecodeLivenessAnalysis.h in Headers */,
                                 0F666EC0183566F900D017F1 /* BytecodeLivenessAnalysisInlines.h in Headers */,
-                               53F40E951D5A7AEF0099A1B6 /* WASMModuleParser.h in Headers */,
+                               53F40E951D5A7AEF0099A1B6 /* WasmModuleParser.h in Headers */,
                                 6514F21918B3E1670098FF8B /* Bytecodes.h in Headers */,
                                 0F885E111849A3BE00F1E3FA /* BytecodeUseDef.h in Headers */,
                                 0F8023EA1613832B00A0BA45 /* ByValInfo.h in Headers */,
@@ -7683,7 +7683,7 @@
                                 BC18C3FB0E16F5CD00B34460 /* DebuggerCallFrame.h in Headers */,
                                 6AD2CB4D19B9140100065719 /* DebuggerEvalEnabler.h in Headers */,
                                 FEA08621182B7A0400F6D851 /* DebuggerPrimitives.h in Headers */,
-                               53F40E851D58F9770099A1B6 /* WASMSections.h in Headers */,
+                               53F40E851D58F9770099A1B6 /* WasmSections.h in Headers */,
                                 DC9A0C1F1D2D9CB10085124E /* B3CaseCollectionInlines.h in Headers */,
                                 0F2D4DDE19832D34007D4B19 /* DebuggerScope.h in Headers */,
                                 0F136D4D174AD69E0075B354 /* DeferGC.h in Headers */,
@@ -7843,7 +7843,7 @@
                                 0F7025AA1714B0FC00382C0E /* DFGOSRExitCompilerCommon.h in Headers */,
                                 0F392C8A1B46188400844728 /* DFGOSRExitFuzz.h in Headers */,
                                 0FEFC9AB1681A3B600567F53 /* DFGOSRExitJumpPlaceholder.h in Headers */,
-                               53F40E8D1D5901F20099A1B6 /* WASMParser.h in Headers */,
+                               53F40E8D1D5901F20099A1B6 /* WasmParser.h in Headers */,
                                 0F40E4A81C497F7400A577FA /* AirOpcodeGenerated.h in Headers */,
                                 0F235BEE17178E7300690C7F /* DFGOSRExitPreparation.h in Headers */,
                                 0F6237981AE45CA700D402EA /* DFGPhantomInsertionPhase.h in Headers */,
@@ -8009,7 +8009,7 @@
                                 0F2B66AD17B6B54500A7AE3F /* GCIncomingRefCountedInlines.h in Headers */,
                                 0F2B66AE17B6B54500A7AE3F /* GCIncomingRefCountedSet.h in Headers */,
                                 0F2B66AF17B6B54500A7AE3F /* GCIncomingRefCountedSetInlines.h in Headers */,
-                               531374BD1D5CE67600AF7A0B /* WASMPlan.h in Headers */,
+                               531374BD1D5CE67600AF7A0B /* WasmPlan.h in Headers */,
                                 2AABCDE718EF294200002096 /* GCLogging.h in Headers */,
                                 0F2BBD981C5FF3F50023EF23 /* B3Variable.h in Headers */,
                                 A54E8EB018BFFBBB00556D28 /* GCSegmentedArray.h in Headers */,
@@ -8063,7 +8063,7 @@
                                 142E3138134FF0A600AFADB5 /* HandleStack.h in Headers */,
                                 1478297B1379E8A800A7C2A3 /* HandleTypes.h in Headers */,
                                 0F10F1A31C420BF0001C07D2 /* AirCustom.h in Headers */,
-                               535557141D9D9EA5006D583B /* WASMMemory.h in Headers */,
+                               535557141D9D9EA5006D583B /* WasmMemory.h in Headers */,
                                 14BA7A9813AADFF8005B7C2C /* Heap.h in Headers */,
                                 0F32BD111BB34F190093A57F /* HeapHelperPool.h in Headers */,
                                 C2DA778318E259990066FCB6 /* HeapInlines.h in Headers */,
@@ -8237,7 +8237,7 @@
                                 0F2B66F617B6B5AB00A7AE3F /* JSGenericTypedArrayViewPrototypeInlines.h in Headers */,
                                 797E07AA1B8FCFB9008400BA /* JSGlobalLexicalEnvironment.h in Headers */,
                                 BC18C4210E16F5CD00B34460 /* JSGlobalObject.h in Headers */,
-                               53F40E8B1D5901BB0099A1B6 /* WASMFunctionParser.h in Headers */,
+                               53F40E8B1D5901BB0099A1B6 /* WasmFunctionParser.h in Headers */,
                                 996B731D1BDA08EF00331B84 /* JSGlobalObject.lut.h in Headers */,
                                 A5FD0086189B1B7E00633231 /* JSGlobalObjectConsoleAgent.h in Headers */,
                                 A5C3A1A618C0490200C9593A /* JSGlobalObjectConsoleClient.h in Headers */,
@@ -8305,7 +8305,7 @@
                                 A7C0C4AC168103020017011D /* JSScriptRefPrivate.h in Headers */,
                                 FE1220271BE7F58C0039E6F2 /* JITAddGenerator.h in Headers */,
                                 0F919D11157F332C004A4E7D /* JSSegmentedVariableObject.h in Headers */,
-                               53F40E911D5903020099A1B6 /* WASMOps.h in Headers */,
+                               53F40E911D5903020099A1B6 /* WasmOps.h in Headers */,
                                 A7299D9E17D12837005F5FF9 /* JSSet.h in Headers */,
                                 A790DD70182F499700588807 /* JSSetIterator.h in Headers */,
                                 BC18C45E0E16F5CD00B34460 /* CLoopStack.h in Headers */,
@@ -8341,7 +8341,7 @@
                                 BC18C42C0E16F5CD00B34460 /* JSValueRef.h in Headers */,
                                 86E3C615167BABD7006D760A /* JSVirtualMachine.h in Headers */,
                                 86E3C61D167BABEE006D760A /* JSVirtualMachineInternal.h in Headers */,
-                               7B98D1371B60CD620023B1A4 /* JSWASMModule.h in Headers */,
+                               7B98D1371B60CD620023B1A4 /* JSWasmModule.h in Headers */,
                                 DC605B5E1CE26EA200593718 /* ProfilerEvent.h in Headers */,
                                 A7CA3AE817DA41AE006538AF /* JSWeakMap.h in Headers */,
                                 A7482E93116A7CAD003B0712 /* JSWeakObjectMapRefInternal.h in Headers */,
@@ -8357,7 +8357,7 @@
                                 0FB5467714F59B5C002C2989 /* LazyOperandValueProfile.h in Headers */,
                                 99DA00B01BD5994E00F4575C /* lazywriter.py in Headers */,
                                 BC18C4310E16F5CD00B34460 /* Lexer.h in Headers */,
-                               53F40E931D5A4AB30099A1B6 /* WASMB3IRGenerator.h in Headers */,
+                               53F40E931D5A4AB30099A1B6 /* WasmB3IRGenerator.h in Headers */,
                                 BC18C52E0E16FCE100B34460 /* Lexer.lut.h in Headers */,
                                 DCF3D56B1CD29472003D5C65 /* LazyClassStructureInlines.h in Headers */,
                                 FE187A021BFBE5610038BBCA /* JITMulGenerator.h in Headers */,
@@ -8607,7 +8607,7 @@
                                 705B41B01A6E501E00716757 /* SymbolObject.h in Headers */,
                                 0F33FCFC1C1625BE00323F67 /* B3Dominators.h in Headers */,
                                 E32FF1EA1DA7571C00A8BF21 /* DOMJITSlowPathCalls.h in Headers */,
-                               53FD04D41D7AB291003287D3 /* WASMCallingConvention.h in Headers */,
+                               53FD04D41D7AB291003287D3 /* WasmCallingConvention.h in Headers */,
                                 705B41B21A6E501E00716757 /* SymbolPrototype.h in Headers */,
                                 AD2FCC201DB59CB200B3E736 /* WebAssemblyTableConstructor.lut.h in Headers */,
                                 996B73281BDA08EF00331B84 /* SymbolPrototype.lut.h in Headers */,
@@ -8668,7 +8668,7 @@
                                 BC18C4200E16F5CD00B34460 /* VM.h in Headers */,
                                 658D3A5619638268003C45D6 /* VMEntryRecord.h in Headers */,
                                 FE5932A8183C5A2600A1ECCC /* VMEntryScope.h in Headers */,
-                               7BC547D31B6959A100959B58 /* WASMFormat.h in Headers */,
+                               7BC547D31B6959A100959B58 /* WasmFormat.h in Headers */,
                                 0F6B8ADD1C4EFAC300969052 /* B3SSACalculator.h in Headers */,
                                 0F2BBD9A1C5FF3F50023EF23 /* B3VariableValue.h in Headers */,
                                 FED94F2F171E3E2300BE77A4 /* Watchdog.h in Headers */,
@@ -9211,7 +9211,7 @@
                         isa = PBXSourcesBuildPhase;
                         buildActionMask = 2147483647;
                         files = (
-                               539EB0811D55608A00C82EF7 /* testWASM.cpp in Sources */,
+                               539EB0811D55608A00C82EF7 /* testWasm.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
                 };
@@ -9427,7 +9427,7 @@
                                 0F5A1273192D9FDF008764A3 /* DFGDoesGC.cpp in Sources */,
                                 0FD3C82614115D4000FD81CB /* DFGDriver.cpp in Sources */,
                                 0FF0F19E16B72A0B005DF95B /* DFGEdge.cpp in Sources */,
-                               535557161D9DFA32006D583B /* WASMMemory.cpp in Sources */,
+                               535557161D9DFA32006D583B /* WasmMemory.cpp in Sources */,
                                 0F8F14331ADF090100ED792C /* DFGEpoch.cpp in Sources */,
                                 0FBC0AE71496C7C400D4FBDD /* DFGExitProfile.cpp in Sources */,
                                 A78A9774179738B8009DF744 /* DFGFailedFinalizer.cpp in Sources */,
@@ -9454,7 +9454,7 @@
                                 0FC97F3F18202119002C9B26 /* DFGJumpReplacement.cpp in Sources */,
                                 FEA0C4021CDD7D1D00481991 /* FunctionWhitelist.cpp in Sources */,
                                 A73A535A1799CD5D00170C19 /* DFGLazyJSValue.cpp in Sources */,
-                               53FD04D31D7AB277003287D3 /* WASMCallingConvention.cpp in Sources */,
+                               53FD04D31D7AB277003287D3 /* WasmCallingConvention.cpp in Sources */,
                                 62F2AA371B0BEDE300610C7A /* DFGLazyNode.cpp in Sources */,
                                 A7D9A29717A0BC7400EE2618 /* DFGLICMPhase.cpp in Sources */,
                                 79C4B15D1BA2158F00FD592E /* DFGLiveCatchVariablePreservationPhase.cpp in Sources */,
@@ -9642,7 +9642,7 @@
                                 9E729407190F01A5001A91B5 /* InitializeThreading.cpp in Sources */,
                                 A513E5B7185B8BD3007E95AD /* InjectedScript.cpp in Sources */,
                                 A514B2C2185A684400F3C7CB /* InjectedScriptBase.cpp in Sources */,
-                               531374BF1D5CE95000AF7A0B /* WASMPlan.cpp in Sources */,
+                               531374BF1D5CE95000AF7A0B /* WasmPlan.cpp in Sources */,
                                 A58E35911860DECF001F24FE /* InjectedScriptHost.cpp in Sources */,
                                 A513E5CA185F9624007E95AD /* InjectedScriptManager.cpp in Sources */,
                                 A5840E20187B7B8600843B10 /* InjectedScriptModule.cpp in Sources */,
@@ -9821,7 +9821,7 @@
                                 86E3C61A167BABEE006D760A /* JSValue.mm in Sources */,
                                 14BD5A320A3E91F600BAF59C /* JSValueRef.cpp in Sources */,
                                 86E3C61C167BABEE006D760A /* JSVirtualMachine.mm in Sources */,
-                               7B98D1361B60CD5F0023B1A4 /* JSWASMModule.cpp in Sources */,
+                               7B98D1361B60CD5F0023B1A4 /* JSWasmModule.cpp in Sources */,
                                 A7CA3AE717DA41AE006538AF /* JSWeakMap.cpp in Sources */,
                                 A7482B9411671147003B0712 /* JSWeakObjectMapRefPrivate.cpp in Sources */,
                                 709FB8671AE335C60039D069 /* JSWeakSet.cpp in Sources */,
@@ -10043,7 +10043,7 @@
                                 AD2FCC021DB58DAD00B3E736 /* WebAssemblyModulePrototype.cpp in Sources */,
                                 FE5932A7183C5A2600A1ECCC /* VMEntryScope.cpp in Sources */,
                                 FE187A011BFBE55E0038BBCA /* JITMulGenerator.cpp in Sources */,
-                               53F40E8F1D5902820099A1B6 /* WASMB3IRGenerator.cpp in Sources */,
+                               53F40E8F1D5902820099A1B6 /* WasmB3IRGenerator.cpp in Sources */,
                                 26718BA41BE99F780052017B /* AirIteratedRegisterCoalescing.cpp in Sources */,
                                 FED94F2E171E3E2300BE77A4 /* Watchdog.cpp in Sources */,
                                 0F919D2515853CE0004A4E7D /* Watchpoint.cpp in Sources */,
@@ -10054,7 +10054,7 @@
                                 A7CA3AE317DA41AE006538AF /* WeakMapConstructor.cpp in Sources */,
                                 0F338DF91BE96AA80013C88F /* B3CCallValue.cpp in Sources */,
                                 A7CA3AEB17DA5168006538AF /* WeakMapData.cpp in Sources */,
-                               53F40E971D5A7BEC0099A1B6 /* WASMModuleParser.cpp in Sources */,
+                               53F40E971D5A7BEC0099A1B6 /* WasmModuleParser.cpp in Sources */,
                                 A7CA3AE517DA41AE006538AF /* WeakMapPrototype.cpp in Sources */,
                                 14E84FA014EE1ACC00D6D5D4 /* WeakSet.cpp in Sources */,
                                 709FB8691AE335C60039D069 /* WeakSetConstructor.cpp in Sources */,
diff --git a/Source/JavaScriptCore/llint/LLIntThunks.cpp b/Source/JavaScriptCore/llint/LLIntThunks.cpp

index fef4488..a9fa7dd 100644 (file)
--- a/Source/JavaScriptCore/llint/LLIntThunks.cpp
+++ b/Source/JavaScriptCore/llint/LLIntThunks.cpp
@@ -42,7 +42,7 @@
  
  namespace JSC {
  
-EncodedJSValue JS_EXPORT_PRIVATE vmEntryToWASM(void* code, VM* vm, ProtoCallFrame* frame)
+EncodedJSValue JS_EXPORT_PRIVATE vmEntryToWasm(void* code, VM* vm, ProtoCallFrame* frame)
  {
      return vmEntryToJavaScript(code, vm, frame);
  }
diff --git a/Source/JavaScriptCore/llint/LLIntThunks.h b/Source/JavaScriptCore/llint/LLIntThunks.h

index 7e8e4ea..fc9742c 100644 (file)
--- a/Source/JavaScriptCore/llint/LLIntThunks.h
+++ b/Source/JavaScriptCore/llint/LLIntThunks.h
@@ -38,7 +38,7 @@ extern "C" {
      EncodedJSValue vmEntryToNative(void*, VM*, ProtoCallFrame*);
  }
  
-EncodedJSValue JS_EXPORT_PRIVATE vmEntryToWASM(void*, VM*, ProtoCallFrame*);
+EncodedJSValue JS_EXPORT_PRIVATE vmEntryToWasm(void*, VM*, ProtoCallFrame*);
  
  namespace LLInt {
  
diff --git a/Source/JavaScriptCore/runtime/Executable.cpp b/Source/JavaScriptCore/runtime/Executable.cpp

index 347cfde..b499866 100644 (file)
--- a/Source/JavaScriptCore/runtime/Executable.cpp
+++ b/Source/JavaScriptCore/runtime/Executable.cpp
@@ -31,7 +31,7 @@
  #include "Debugger.h"
  #include "JIT.h"
  #include "JSCInlines.h"
-#include "JSWASMModule.h"
+#include "JSWasmModule.h"
  #include "LLIntEntrypoint.h"
  #include "Parser.h"
  #include "TypeProfiler.h"
@@ -747,7 +747,7 @@ FunctionExecutable* FunctionExecutable::fromGlobalCode(
  #if ENABLE(WEBASSEMBLY)
  const ClassInfo WebAssemblyExecutable::s_info = { "WebAssemblyExecutable", &ExecutableBase::s_info, 0, CREATE_METHOD_TABLE(WebAssemblyExecutable) };
  
-WebAssemblyExecutable::WebAssemblyExecutable(VM& vm, const SourceCode& source, JSWASMModule* module, unsigned functionIndex)
+WebAssemblyExecutable::WebAssemblyExecutable(VM& vm, const SourceCode& source, JSWasmModule* module, unsigned functionIndex)
      : ExecutableBase(vm, vm.webAssemblyExecutableStructure.get(), NUM_PARAMETERS_NOT_COMPILED, NoIntrinsic)
      , m_source(source)
      , m_module(vm, this, module)
diff --git a/Source/JavaScriptCore/runtime/Executable.h b/Source/JavaScriptCore/runtime/Executable.h

index 9c35596..1d23b15 100644 (file)
--- a/Source/JavaScriptCore/runtime/Executable.h
+++ b/Source/JavaScriptCore/runtime/Executable.h
@@ -46,7 +46,7 @@ class CodeBlock;
  class EvalCodeBlock;
  class FunctionCodeBlock;
  class JSScope;
-class JSWASMModule;
+class JSWasmModule;
  class LLIntOffsetsExtractor;
  class ModuleProgramCodeBlock;
  class ProgramCodeBlock;
@@ -719,7 +719,7 @@ public:
      typedef ExecutableBase Base;
      static const unsigned StructureFlags = Base::StructureFlags | StructureIsImmortal;
  
-    static WebAssemblyExecutable* create(VM& vm, const SourceCode& source, JSWASMModule* module, unsigned functionIndex)
+    static WebAssemblyExecutable* create(VM& vm, const SourceCode& source, JSWasmModule* module, unsigned functionIndex)
      {
          WebAssemblyExecutable* executable = new (NotNull, allocateCell<WebAssemblyExecutable>(vm.heap)) WebAssemblyExecutable(vm, source, module, functionIndex);
          executable->finishCreation(vm);
@@ -744,12 +744,12 @@ public:
  
  private:
      friend class ExecutableBase;
-    WebAssemblyExecutable(VM&, const SourceCode&, JSWASMModule*, unsigned functionIndex);
+    WebAssemblyExecutable(VM&, const SourceCode&, JSWasmModule*, unsigned functionIndex);
  
      static void visitChildren(JSCell*, SlotVisitor&);
  
      SourceCode m_source;
-    WriteBarrier<JSWASMModule> m_module;
+    WriteBarrier<JSWasmModule> m_module;
      unsigned m_functionIndex;
  
      WriteBarrier<WebAssemblyCodeBlock> m_codeBlockForCall;
diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt

index 155c797..87d9aed 100644 (file)
--- a/Source/JavaScriptCore/shell/CMakeLists.txt
+++ b/Source/JavaScriptCore/shell/CMakeLists.txt
@@ -50,7 +50,7 @@ if (NOT WIN32)
      )
  
      set(TESTWASM_SOURCES
-        ../testWASM.cpp
+        ../testWasm.cpp
      )
  
      add_executable(testb3 ${TESTB3_SOURCES})
diff --git a/Source/JavaScriptCore/testWASM.cpp b/Source/JavaScriptCore/testWasm.cpp

similarity index 99%

rename from Source/JavaScriptCore/testWASM.cpp

rename to Source/JavaScriptCore/testWasm.cpp

index 0576ec4..1813207 100644 (file)
--- a/Source/JavaScriptCore/testWASM.cpp
+++ b/Source/JavaScriptCore/testWasm.cpp
@@ -32,8 +32,8 @@
  #include "LLIntThunks.h"
  #include "ProtoCallFrame.h"
  #include "VM.h"
-#include "WASMMemory.h"
-#include "WASMPlan.h"
+#include "WasmMemory.h"
+#include "WasmPlan.h"
  
  #include <wtf/DataLog.h>
  #include <wtf/LEBDecoder.h>
@@ -47,17 +47,17 @@ public:
  
      Vector<String> m_arguments;
      bool m_runLEBTests { false };
-    bool m_runWASMTests { false };
+    bool m_runWasmTests { false };
  
      void parseArguments(int, char**);
  };
  
  static NO_RETURN void printUsageStatement(bool help = false)
  {
-    fprintf(stderr, "Usage: testWASM [options]\n");
+    fprintf(stderr, "Usage: testWasm [options]\n");
      fprintf(stderr, "  -h|--help  Prints this help message\n");
      fprintf(stderr, "  -l|--leb   Runs the LEB decoder tests\n");
-    fprintf(stderr, "  -w|--web   Run the WASM tests\n");
+    fprintf(stderr, "  -w|--web   Run the Wasm tests\n");
      fprintf(stderr, "\n");
  
      exit(help ? EXIT_SUCCESS : EXIT_FAILURE);
@@ -76,7 +76,7 @@ void CommandLine::parseArguments(int argc, char** argv)
              m_runLEBTests = true;
  
          if (!strcmp(arg, "-w") || !strcmp(arg, "--web"))
-            m_runWASMTests = true;
+            m_runWasmTests = true;
      }
  
      for (; i < argc; ++i)
@@ -204,7 +204,7 @@ static void runLEBTests()
  static JSC::VM* vm;
  
  using namespace JSC;
-using namespace WASM;
+using namespace Wasm;
  using namespace B3;
  
  template<typename T>
@@ -225,7 +225,7 @@ T invoke(MacroAssemblerCodePtr ptr, std::initializer_list<JSValue> args)
      protoCallFrame.init(nullptr, nullptr, firstArgument, argCount, remainingArguments);
  
      // This won't work for floating point values but we don't have those yet.
-    return static_cast<T>(vmEntryToWASM(ptr.executableAddress(), vm, &protoCallFrame));
+    return static_cast<T>(vmEntryToWasm(ptr.executableAddress(), vm, &protoCallFrame));
  }
  
  template<typename T>
@@ -240,7 +240,7 @@ inline JSValue box(uint64_t value)
  }
  
  // For now we inline the test files.
-static void runWASMTests()
+static void runWasmTests()
  {
      {
          // Generated from:
@@ -1189,13 +1189,13 @@ int main(int argc, char** argv)
      if (options.m_runLEBTests)
          runLEBTests();
  
-    if (options.m_runWASMTests) {
+    if (options.m_runWasmTests) {
  #if ENABLE(WEBASSEMBLY)
          JSC::initializeThreading();
          vm = &JSC::VM::create(JSC::LargeHeap).leakRef();
-        runWASMTests();
+        runWasmTests();
  #else
-        dataLogLn("WASM is not enabled!");
+        dataLogLn("Wasm is not enabled!");
          return EXIT_FAILURE;
  #endif // ENABLE(WEBASSEMBLY)
      }
diff --git a/Source/JavaScriptCore/wasm/JSWASMModule.cpp b/Source/JavaScriptCore/wasm/JSWasmModule.cpp

similarity index 82%

rename from Source/JavaScriptCore/wasm/JSWASMModule.cpp

rename to Source/JavaScriptCore/wasm/JSWasmModule.cpp

index cd996ac..1f66a9d 100644 (file)
--- a/Source/JavaScriptCore/wasm/JSWASMModule.cpp
+++ b/Source/JavaScriptCore/wasm/JSWasmModule.cpp
@@ -24,7 +24,7 @@
   */
  
  #include "config.h"
-#include "JSWASMModule.h"
+#include "JSWasmModule.h"
  
  #if ENABLE(WEBASSEMBLY)
  
@@ -39,24 +39,24 @@
  
  namespace JSC {
  
-const ClassInfo JSWASMModule::s_info = { "WASMModule", &Base::s_info, 0, CREATE_METHOD_TABLE(JSWASMModule) };
+const ClassInfo JSWasmModule::s_info = { "WasmModule", &Base::s_info, 0, CREATE_METHOD_TABLE(JSWasmModule) };
  
-JSWASMModule::JSWASMModule(VM& vm, Structure* structure, JSArrayBuffer* arrayBuffer)
+JSWasmModule::JSWasmModule(VM& vm, Structure* structure, JSArrayBuffer* arrayBuffer)
      : Base(vm, structure)
  {
      if (arrayBuffer)
          m_arrayBuffer.set(vm, this, arrayBuffer);
  }
  
-void JSWASMModule::destroy(JSCell* cell)
+void JSWasmModule::destroy(JSCell* cell)
  {
-    JSWASMModule* thisObject = jsCast<JSWASMModule*>(cell);
-    thisObject->JSWASMModule::~JSWASMModule();
+    JSWasmModule* thisObject = jsCast<JSWasmModule*>(cell);
+    thisObject->JSWasmModule::~JSWasmModule();
  }
  
-void JSWASMModule::visitChildren(JSCell* cell, SlotVisitor& visitor)
+void JSWasmModule::visitChildren(JSCell* cell, SlotVisitor& visitor)
  {
-    JSWASMModule* thisObject = jsCast<JSWASMModule*>(cell);
+    JSWasmModule* thisObject = jsCast<JSWasmModule*>(cell);
      ASSERT_GC_OBJECT_INHERITS(thisObject, info());
      Base::visitChildren(thisObject, visitor);
      visitor.append(&thisObject->m_arrayBuffer);
diff --git a/Source/JavaScriptCore/wasm/JSWASMModule.h b/Source/JavaScriptCore/wasm/JSWasmModule.h

similarity index 77%

rename from Source/JavaScriptCore/wasm/JSWASMModule.h

rename to Source/JavaScriptCore/wasm/JSWasmModule.h

index 14b6eb5..3bb2352 100644 (file)
--- a/Source/JavaScriptCore/wasm/JSWASMModule.h
+++ b/Source/JavaScriptCore/wasm/JSWasmModule.h
@@ -28,11 +28,11 @@
  #if ENABLE(WEBASSEMBLY)
  
  #include "JSDestructibleObject.h"
-#include "WASMFormat.h"
+#include "WasmFormat.h"
  
  namespace JSC {
  
-class JSWASMModule : public JSDestructibleObject {
+class JSWasmModule : public JSDestructibleObject {
  public:
      typedef JSDestructibleObject Base;
  
@@ -55,9 +55,9 @@ public:
          double doubleValue;
      };
  
-    static JSWASMModule* create(VM& vm, Structure* structure, JSArrayBuffer* arrayBuffer)
+    static JSWasmModule* create(VM& vm, Structure* structure, JSArrayBuffer* arrayBuffer)
      {
-        JSWASMModule* module = new (NotNull, allocateCell<JSWASMModule>(vm.heap)) JSWASMModule(vm, structure, arrayBuffer);
+        JSWasmModule* module = new (NotNull, allocateCell<JSWasmModule>(vm.heap)) JSWasmModule(vm, structure, arrayBuffer);
          module->finishCreation(vm);
          return module;
      }
@@ -75,12 +75,12 @@ public:
      Vector<uint32_t>& i32Constants() { return m_i32Constants; }
      Vector<float>& f32Constants() { return m_f32Constants; }
      Vector<double>& f64Constants() { return m_f64Constants; }
-    Vector<WASM::Signature>& signatures() { return m_signatures; }
-    Vector<WASM::FunctionImport>& functionImports() { return m_functionImports; }
-    Vector<WASM::FunctionImportSignature>& functionImportSignatures() { return m_functionImportSignatures; }
-    Vector<WASM::Type>& globalVariableTypes() { return m_globalVariableTypes; }
-    Vector<WASM::FunctionDeclaration>& functionDeclarations() { return m_functionDeclarations; }
-    Vector<WASM::FunctionPointerTable>& functionPointerTables() { return m_functionPointerTables; }
+    Vector<Wasm::Signature>& signatures() { return m_signatures; }
+    Vector<Wasm::FunctionImport>& functionImports() { return m_functionImports; }
+    Vector<Wasm::FunctionImportSignature>& functionImportSignatures() { return m_functionImportSignatures; }
+    Vector<Wasm::Type>& globalVariableTypes() { return m_globalVariableTypes; }
+    Vector<Wasm::FunctionDeclaration>& functionDeclarations() { return m_functionDeclarations; }
+    Vector<Wasm::FunctionPointerTable>& functionPointerTables() { return m_functionPointerTables; }
  
      const JSArrayBuffer* arrayBuffer() const { return m_arrayBuffer.get(); }
      Vector<WriteBarrier<JSFunction>>& functions() { return m_functions; }
@@ -90,17 +90,17 @@ public:
      Vector<WriteBarrier<JSFunction>>& importedFunctions() { return m_importedFunctions; }
  
  private:
-    JSWASMModule(VM&, Structure*, JSArrayBuffer*);
+    JSWasmModule(VM&, Structure*, JSArrayBuffer*);
  
      Vector<uint32_t> m_i32Constants;
      Vector<float> m_f32Constants;
      Vector<double> m_f64Constants;
-    Vector<WASM::Signature> m_signatures;
-    Vector<WASM::FunctionImport> m_functionImports;
-    Vector<WASM::FunctionImportSignature> m_functionImportSignatures;
-    Vector<WASM::Type> m_globalVariableTypes;
-    Vector<WASM::FunctionDeclaration> m_functionDeclarations;
-    Vector<WASM::FunctionPointerTable> m_functionPointerTables;
+    Vector<Wasm::Signature> m_signatures;
+    Vector<Wasm::FunctionImport> m_functionImports;
+    Vector<Wasm::FunctionImportSignature> m_functionImportSignatures;
+    Vector<Wasm::Type> m_globalVariableTypes;
+    Vector<Wasm::FunctionDeclaration> m_functionDeclarations;
+    Vector<Wasm::FunctionPointerTable> m_functionPointerTables;
  
      WriteBarrier<JSArrayBuffer> m_arrayBuffer;
      Vector<WriteBarrier<JSFunction>> m_functions;
diff --git a/Source/JavaScriptCore/wasm/WASMB3IRGenerator.cpp b/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp

similarity index 99%

rename from Source/JavaScriptCore/wasm/WASMB3IRGenerator.cpp

rename to Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp

index b4a800c..5359d30 100644 (file)
--- a/Source/JavaScriptCore/wasm/WASMB3IRGenerator.cpp
+++ b/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp
@@ -24,7 +24,7 @@
   */
  
  #include "config.h"
-#include "WASMB3IRGenerator.h"
+#include "WasmB3IRGenerator.h"
  
  #if ENABLE(WEBASSEMBLY)
  
@@ -39,9 +39,9 @@
  #include "B3WasmAddressValue.h"
  #include "B3WasmBoundsCheckValue.h"
  #include "VirtualRegister.h"
-#include "WASMCallingConvention.h"
-#include "WASMFunctionParser.h"
-#include "WASMMemory.h"
+#include "WasmCallingConvention.h"
+#include "WasmFunctionParser.h"
+#include "WasmMemory.h"
  #include <wtf/Optional.h>
  
  void dumpProcedure(void* ptr)
@@ -50,7 +50,7 @@ void dumpProcedure(void* ptr)
      proc->dump(WTF::dataFile());
  }
  
-namespace JSC { namespace WASM {
+namespace JSC { namespace Wasm {
  
  namespace {
  
@@ -727,6 +727,6 @@ std::unique_ptr<FunctionCompilation> parseAndCompile(VM& vm, Vector<uint8_t>& so
      return result;
  }
  
-} } // namespace JSC::WASM
+} } // namespace JSC::Wasm
  
  #endif // ENABLE(WEBASSEMBLY)
diff --git a/Source/JavaScriptCore/wasm/WASMB3IRGenerator.h b/Source/JavaScriptCore/wasm/WasmB3IRGenerator.h

similarity index 95%

rename from Source/JavaScriptCore/wasm/WASMB3IRGenerator.h

rename to Source/JavaScriptCore/wasm/WasmB3IRGenerator.h

index dfbc83f..f8d8420 100644 (file)
--- a/Source/JavaScriptCore/wasm/WASMB3IRGenerator.h
+++ b/Source/JavaScriptCore/wasm/WasmB3IRGenerator.h
@@ -29,16 +29,16 @@
  
  #include "B3Compilation.h"
  #include "VM.h"
-#include "WASMFormat.h"
+#include "WasmFormat.h"
  
  extern "C" void dumpProcedure(void*);
  
-namespace JSC { namespace WASM {
+namespace JSC { namespace Wasm {
  
  class Memory;
  
  std::unique_ptr<FunctionCompilation> parseAndCompile(VM&, Vector<uint8_t>&, Memory*, FunctionInformation, const Vector<FunctionInformation>&, unsigned optLevel = 1);
  
-} } // namespace JSC::WASM
+} } // namespace JSC::Wasm
  
  #endif // ENABLE(WEBASSEMBLY)
diff --git a/Source/JavaScriptCore/wasm/WASMCallingConvention.cpp b/Source/JavaScriptCore/wasm/WasmCallingConvention.cpp

similarity index 84%

rename from Source/JavaScriptCore/wasm/WASMCallingConvention.cpp

rename to Source/JavaScriptCore/wasm/WasmCallingConvention.cpp

index 7acbbc2..9f6ac67 100644 (file)
--- a/Source/JavaScriptCore/wasm/WASMCallingConvention.cpp
+++ b/Source/JavaScriptCore/wasm/WasmCallingConvention.cpp
@@ -24,13 +24,13 @@
   */
  
  #include "config.h"
-#include "WASMCallingConvention.h"
+#include "WasmCallingConvention.h"
  
  #if ENABLE(WEBASSEMBLY)
  
  #include <wtf/NeverDestroyed.h>
  
-namespace JSC { namespace WASM {
+namespace JSC { namespace Wasm {
  
  const JSCCallingConvention& jscCallingConvention()
  {
@@ -43,11 +43,11 @@ const JSCCallingConvention& jscCallingConvention()
      return staticJSCCallingConvention;
  }
  
-const WASMCallingConvention& wasmCallingConvention()
+const WasmCallingConvention& wasmCallingConvention()
  {
-    static LazyNeverDestroyed<JSCCallingConvention> staticWASMCallingConvention;
-    static std::once_flag staticWASMCallingConventionFlag;
-    std::call_once(staticWASMCallingConventionFlag, [] () {
+    static LazyNeverDestroyed<JSCCallingConvention> staticWasmCallingConvention;
+    static std::once_flag staticWasmCallingConventionFlag;
+    std::call_once(staticWasmCallingConventionFlag, [] () {
          Vector<Reg> gprArgumentRegisters(GPRInfo::numberOfArgumentRegisters);
          for (unsigned i = 0; i < GPRInfo::numberOfArgumentRegisters; ++i)
              gprArgumentRegisters[i] = GPRInfo::toArgumentRegister(i);
@@ -56,12 +56,12 @@ const WASMCallingConvention& wasmCallingConvention()
          for (unsigned i = 0; i < FPRInfo::numberOfArgumentRegisters; ++i)
              fprArgumentRegisters[i] = FPRInfo::toArgumentRegister(i);
  
-        staticWASMCallingConvention.construct(WTFMove(gprArgumentRegisters), WTFMove(fprArgumentRegisters), RegisterSet::calleeSaveRegisters());
+        staticWasmCallingConvention.construct(WTFMove(gprArgumentRegisters), WTFMove(fprArgumentRegisters), RegisterSet::calleeSaveRegisters());
      });
  
-    return staticWASMCallingConvention;
+    return staticWasmCallingConvention;
  }
  
-} } // namespace JSC::WASM
+} } // namespace JSC::Wasm
  
  #endif // ENABLE(B3_JIT)
diff --git a/Source/JavaScriptCore/wasm/WASMCallingConvention.h b/Source/JavaScriptCore/wasm/WasmCallingConvention.h

similarity index 97%

rename from Source/JavaScriptCore/wasm/WASMCallingConvention.h

rename to Source/JavaScriptCore/wasm/WasmCallingConvention.h

index 16eb548..7442e71 100644 (file)
--- a/Source/JavaScriptCore/wasm/WASMCallingConvention.h
+++ b/Source/JavaScriptCore/wasm/WasmCallingConvention.h
@@ -39,9 +39,9 @@
  #include "CallFrame.h"
  #include "LinkBuffer.h"
  #include "RegisterSet.h"
-#include "WASMFormat.h"
+#include "WasmFormat.h"
  
-namespace JSC { namespace WASM {
+namespace JSC { namespace Wasm {
  
  typedef unsigned (*NextOffset)(unsigned currentOffset, B3::Type type);
  
@@ -155,11 +155,11 @@ inline unsigned nextJSCOffset(unsigned currentOffset, B3::Type)
  constexpr unsigned jscHeaderSize = ExecState::headerSizeInRegisters * sizeof(Register);
  typedef CallingConvention<jscHeaderSize, nextJSCOffset> JSCCallingConvention;
  
-typedef JSCCallingConvention WASMCallingConvention;
+typedef JSCCallingConvention WasmCallingConvention;
  
  const JSCCallingConvention& jscCallingConvention();
-const WASMCallingConvention& wasmCallingConvention();
+const WasmCallingConvention& wasmCallingConvention();
  
-} } // namespace JSC::WASM
+} } // namespace JSC::Wasm
  
  #endif // ENABLE(WEBASSEMBLY)
diff --git a/Source/JavaScriptCore/wasm/WASMFormat.h b/Source/JavaScriptCore/wasm/WasmFormat.h

similarity index 92%

rename from Source/JavaScriptCore/wasm/WASMFormat.h

rename to Source/JavaScriptCore/wasm/WasmFormat.h

index ac46ff3..7eb5b1a 100644 (file)
--- a/Source/JavaScriptCore/wasm/WASMFormat.h
+++ b/Source/JavaScriptCore/wasm/WasmFormat.h
@@ -54,7 +54,7 @@ namespace JSC {
  
  class JSFunction;
  
-namespace WASM {
+namespace Wasm {
  
  enum Type : uint8_t {
      Void,
@@ -65,10 +65,10 @@ enum Type : uint8_t {
      LastValueType = F64,
  };
  
-static_assert(I32 == 1, "WASM needs I32 to have the value 1");
-static_assert(I64 == 2, "WASM needs I64 to have the value 2");
-static_assert(F32 == 3, "WASM needs F32 to have the value 3");
-static_assert(F64 == 4, "WASM needs F64 to have the value 4");
+static_assert(I32 == 1, "Wasm needs I32 to have the value 1");
+static_assert(I64 == 2, "Wasm needs I64 to have the value 2");
+static_assert(F32 == 3, "Wasm needs F32 to have the value 3");
+static_assert(F64 == 4, "Wasm needs F64 to have the value 4");
  
  inline B3::Type toB3Type(Type type)
  {
@@ -139,6 +139,6 @@ struct FunctionCompilation {
      std::unique_ptr<B3::Compilation> jsEntryPoint;
  };
  
-} } // namespace JSC::WASM
+} } // namespace JSC::Wasm
  
  #endif // ENABLE(WEBASSEMBLY)
diff --git a/Source/JavaScriptCore/wasm/WASMFunctionParser.h b/Source/JavaScriptCore/wasm/WasmFunctionParser.h

similarity index 99%

rename from Source/JavaScriptCore/wasm/WASMFunctionParser.h

rename to Source/JavaScriptCore/wasm/WasmFunctionParser.h

index 452e28b..0bce7e3 100644 (file)
--- a/Source/JavaScriptCore/wasm/WASMFunctionParser.h
+++ b/Source/JavaScriptCore/wasm/WasmFunctionParser.h
@@ -27,10 +27,10 @@
  
  #if ENABLE(WEBASSEMBLY)
  
-#include "WASMParser.h"
+#include "WasmParser.h"
  #include <wtf/DataLog.h>
  
-namespace JSC { namespace WASM {
+namespace JSC { namespace Wasm {
  
  enum class BlockType {
      If,
@@ -389,6 +389,6 @@ bool FunctionParser<Context>::parseUnreachableExpression(OpType op)
  
  #undef CREATE_CASE
  
-} } // namespace JSC::WASM
+} } // namespace JSC::Wasm
  
  #endif // ENABLE(WEBASSEMBLY)
diff --git a/Source/JavaScriptCore/wasm/WASMMemory.cpp b/Source/JavaScriptCore/wasm/WasmMemory.cpp

similarity index 97%

rename from Source/JavaScriptCore/wasm/WASMMemory.cpp

rename to Source/JavaScriptCore/wasm/WasmMemory.cpp

index 6c850d9..acd133a 100644 (file)
--- a/Source/JavaScriptCore/wasm/WASMMemory.cpp
+++ b/Source/JavaScriptCore/wasm/WasmMemory.cpp
@@ -24,11 +24,11 @@
   */
  
  #include "config.h"
-#include "WASMMemory.h"
+#include "WasmMemory.h"
  
  #if ENABLE(WEBASSEMBLY)
  
-namespace JSC { namespace WASM {
+namespace JSC { namespace Wasm {
  
  Memory::Memory(uint32_t startingSize, uint32_t capacity, const Vector<unsigned>& pinnedSizeRegisters)
      : m_mode(Mode::BoundsChecking)
@@ -74,6 +74,6 @@ Memory::Memory(uint32_t startingSize, uint32_t capacity, const Vector<unsigned>&
  
  } // namespace JSC
  
-} // namespace WASM
+} // namespace Wasm
  
  #endif // ENABLE(WEBASSEMBLY)
diff --git a/Source/JavaScriptCore/wasm/WASMMemory.h b/Source/JavaScriptCore/wasm/WasmMemory.h

similarity index 97%

rename from Source/JavaScriptCore/wasm/WASMMemory.h

rename to Source/JavaScriptCore/wasm/WasmMemory.h

index 04e2485..7b20a04 100644 (file)
--- a/Source/JavaScriptCore/wasm/WASMMemory.h
+++ b/Source/JavaScriptCore/wasm/WasmMemory.h
@@ -27,11 +27,11 @@
  
  #if ENABLE(WEBASSEMBLY)
  
-#include "WASMCallingConvention.h"
+#include "WasmCallingConvention.h"
  
  #include <wtf/Vector.h>
  
-namespace JSC { namespace WASM {
+namespace JSC { namespace Wasm {
  
  struct PinnedSizeRegisterInfo {
      GPRReg sizeRegister;
@@ -94,6 +94,6 @@ private:
      uint64_t m_mappedCapacity { 0 };
  };
  
-} } // namespace JSC::WASM
+} } // namespace JSC::Wasm
  
  #endif // ENABLE(WEBASSEMLY)
diff --git a/Source/JavaScriptCore/wasm/WASMModuleParser.cpp b/Source/JavaScriptCore/wasm/WasmModuleParser.cpp

similarity index 97%

rename from Source/JavaScriptCore/wasm/WASMModuleParser.cpp

rename to Source/JavaScriptCore/wasm/WasmModuleParser.cpp

index 0e796bf..7ee01b0 100644 (file)
--- a/Source/JavaScriptCore/wasm/WASMModuleParser.cpp
+++ b/Source/JavaScriptCore/wasm/WasmModuleParser.cpp
@@ -24,18 +24,18 @@
   */
  
  #include "config.h"
-#include "WASMModuleParser.h"
+#include "WasmModuleParser.h"
  
  #if ENABLE(WEBASSEMBLY)
  
-#include "JSWASMModule.h"
-#include "WASMFormat.h"
-#include "WASMOps.h"
-#include "WASMSections.h"
+#include "JSWasmModule.h"
+#include "WasmFormat.h"
+#include "WasmOps.h"
+#include "WasmSections.h"
  
  #include <sys/mman.h>
  
-namespace JSC { namespace WASM {
+namespace JSC { namespace Wasm {
  
  static const bool verbose = false;
  
@@ -286,6 +286,6 @@ bool ModuleParser::parseFunctionDefinitions()
      return true;
  }
  
-} } // namespace JSC::WASM
+} } // namespace JSC::Wasm
  
  #endif // ENABLE(WEBASSEMBLY)
diff --git a/Source/JavaScriptCore/wasm/WASMModuleParser.h b/Source/JavaScriptCore/wasm/WasmModuleParser.h

similarity index 94%

rename from Source/JavaScriptCore/wasm/WASMModuleParser.h

rename to Source/JavaScriptCore/wasm/WasmModuleParser.h

index 75e4d10..540d5a6 100644 (file)
--- a/Source/JavaScriptCore/wasm/WASMModuleParser.h
+++ b/Source/JavaScriptCore/wasm/WasmModuleParser.h
@@ -27,12 +27,12 @@
  
  #if ENABLE(WEBASSEMBLY)
  
-#include "WASMMemory.h"
-#include "WASMOps.h"
-#include "WASMParser.h"
+#include "WasmMemory.h"
+#include "WasmOps.h"
+#include "WasmParser.h"
  #include <wtf/Vector.h>
  
-namespace JSC { namespace WASM {
+namespace JSC { namespace Wasm {
  
  class ModuleParser : public Parser {
  public:
@@ -61,6 +61,6 @@ private:
      std::unique_ptr<Memory> m_memory;
  };
  
-} } // namespace JSC::WASM
+} } // namespace JSC::Wasm
  
  #endif // ENABLE(WEBASSEMBLY)
diff --git a/Source/JavaScriptCore/wasm/WASMOps.h b/Source/JavaScriptCore/wasm/WasmOps.h

similarity index 99%

rename from Source/JavaScriptCore/wasm/WASMOps.h

rename to Source/JavaScriptCore/wasm/WasmOps.h

index 66f7289..3cd9ee7 100644 (file)
--- a/Source/JavaScriptCore/wasm/WASMOps.h
+++ b/Source/JavaScriptCore/wasm/WasmOps.h
@@ -31,7 +31,7 @@
  
  #include <cstdint>
  
-namespace JSC { namespace WASM {
+namespace JSC { namespace Wasm {
  
  #define FOR_EACH_WASM_SPECIAL_OP(macro) \
      macro(I32Const, 0x10, Oops) \
@@ -243,7 +243,7 @@ inline bool isControlOp(OpType op)
      return false;
  }
  
-} } // namespace JSC::WASM
+} } // namespace JSC::Wasm
  
  #endif // ENABLE(WEBASSEMBLY)
  
diff --git a/Source/JavaScriptCore/wasm/WASMParser.h b/Source/JavaScriptCore/wasm/WasmParser.h

similarity index 96%

rename from Source/JavaScriptCore/wasm/WASMParser.h

rename to Source/JavaScriptCore/wasm/WasmParser.h

index 1b79186..748134d 100644 (file)
--- a/Source/JavaScriptCore/wasm/WASMParser.h
+++ b/Source/JavaScriptCore/wasm/WasmParser.h
@@ -29,12 +29,12 @@
  
  #include "B3Compilation.h"
  #include "B3Procedure.h"
-#include "WASMFormat.h"
-#include "WASMOps.h"
-#include "WASMSections.h"
+#include "WasmFormat.h"
+#include "WasmOps.h"
+#include "WasmSections.h"
  #include <wtf/LEBDecoder.h>
  
-namespace JSC { namespace WASM {
+namespace JSC { namespace Wasm {
  
  class Parser {
  protected:
@@ -128,6 +128,6 @@ ALWAYS_INLINE bool Parser::parseValueType(Type& result)
      return true;
  }
  
-} } // namespace JSC::WASM
+} } // namespace JSC::Wasm
  
  #endif // ENABLE(WEBASSEMBLY)
diff --git a/Source/JavaScriptCore/wasm/WASMPlan.cpp b/Source/JavaScriptCore/wasm/WasmPlan.cpp

similarity index 93%

rename from Source/JavaScriptCore/wasm/WASMPlan.cpp

rename to Source/JavaScriptCore/wasm/WasmPlan.cpp

index ba298ff..ba0fa3f 100644 (file)
--- a/Source/JavaScriptCore/wasm/WASMPlan.cpp
+++ b/Source/JavaScriptCore/wasm/WasmPlan.cpp
@@ -24,17 +24,17 @@
   */
  
  #include "config.h"
-#include "WASMPlan.h"
+#include "WasmPlan.h"
  
  #if ENABLE(WEBASSEMBLY)
  
  #include "B3Compilation.h"
-#include "WASMB3IRGenerator.h"
-#include "WASMCallingConvention.h"
-#include "WASMModuleParser.h"
+#include "WasmB3IRGenerator.h"
+#include "WasmCallingConvention.h"
+#include "WasmModuleParser.h"
  #include <wtf/DataLog.h>
  
-namespace JSC { namespace WASM {
+namespace JSC { namespace Wasm {
  
  static const bool verbose = false;
  
@@ -67,6 +67,6 @@ Plan::Plan(VM& vm, Vector<uint8_t> source)
      memory = WTFMove(moduleParser.memory());
  }
  
-} } // namespace JSC::WASM
+} } // namespace JSC::Wasm
  
  #endif // ENABLE(WEBASSEMBLY)
diff --git a/Source/JavaScriptCore/wasm/WASMPlan.h b/Source/JavaScriptCore/wasm/WasmPlan.h

similarity index 92%

rename from Source/JavaScriptCore/wasm/WASMPlan.h

rename to Source/JavaScriptCore/wasm/WasmPlan.h

index b845ee1..fed136a 100644 (file)
--- a/Source/JavaScriptCore/wasm/WASMPlan.h
+++ b/Source/JavaScriptCore/wasm/WasmPlan.h
@@ -29,14 +29,14 @@
  
  #include "CompilationResult.h"
  #include "VM.h"
-#include "WASMFormat.h"
+#include "WasmFormat.h"
  #include <wtf/ThreadSafeRefCounted.h>
  #include <wtf/Vector.h>
  
-namespace JSC { namespace WASM {
+namespace JSC { namespace Wasm {
  class Memory;
  
-// TODO: This should create a WASM Module not a list of functions.
+// TODO: This should create a Wasm Module not a list of functions.
  class Plan {
  public:
      JS_EXPORT_PRIVATE Plan(VM&, Vector<uint8_t> source);
@@ -45,6 +45,6 @@ public:
      std::unique_ptr<Memory> memory;
  };
  
-} } // namespace JSC::WASM
+} } // namespace JSC::Wasm
  
  #endif // ENABLE(WEBASSEMBLY)
diff --git a/Source/JavaScriptCore/wasm/WASMSections.h b/Source/JavaScriptCore/wasm/WasmSections.h

similarity index 96%

rename from Source/JavaScriptCore/wasm/WASMSections.h

rename to Source/JavaScriptCore/wasm/WasmSections.h

index 07c72d4..7257867 100644 (file)
--- a/Source/JavaScriptCore/wasm/WASMSections.h
+++ b/Source/JavaScriptCore/wasm/WasmSections.h
@@ -27,7 +27,7 @@
  
  #if ENABLE(WEBASSEMBLY)
  
-namespace JSC { namespace WASM {
+namespace JSC { namespace Wasm {
  
  struct Sections {
      enum Section : uint8_t {
@@ -45,6 +45,6 @@ struct Sections {
      }
  };
  
-} } // namespace JSC::WASM
+} } // namespace JSC::Wasm
  
  #endif // ENABLE(WEBASSEMBLY)
author	keith_miller@apple.com <keith_miller@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
	Fri, 21 Oct 2016 19:14:20 +0000 (19:14 +0000)
committer	keith_miller@apple.com <keith_miller@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
	Fri, 21 Oct 2016 19:14:20 +0000 (19:14 +0000)
Source/JavaScriptCore/CMakeLists.txt		patch \| blob \| history
Source/JavaScriptCore/ChangeLog		patch \| blob \| history
Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig		patch \| blob \| history
Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj		patch \| blob \| history
Source/JavaScriptCore/llint/LLIntThunks.cpp		patch \| blob \| history
Source/JavaScriptCore/llint/LLIntThunks.h		patch \| blob \| history
Source/JavaScriptCore/runtime/Executable.cpp		patch \| blob \| history
Source/JavaScriptCore/runtime/Executable.h		patch \| blob \| history
Source/JavaScriptCore/shell/CMakeLists.txt		patch \| blob \| history
Source/JavaScriptCore/testWasm.cpp	[moved from Source/JavaScriptCore/testWASM.cpp with 99% similarity]	patch \| blob \| history
Source/JavaScriptCore/wasm/JSWasmModule.cpp	[moved from Source/JavaScriptCore/wasm/JSWASMModule.cpp with 82% similarity]	patch \| blob \| history
Source/JavaScriptCore/wasm/JSWasmModule.h	[moved from Source/JavaScriptCore/wasm/JSWASMModule.h with 77% similarity]	patch \| blob \| history
Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp	[moved from Source/JavaScriptCore/wasm/WASMB3IRGenerator.cpp with 99% similarity]	patch \| blob \| history
Source/JavaScriptCore/wasm/WasmB3IRGenerator.h	[moved from Source/JavaScriptCore/wasm/WASMB3IRGenerator.h with 95% similarity]	patch \| blob \| history
Source/JavaScriptCore/wasm/WasmCallingConvention.cpp	[moved from Source/JavaScriptCore/wasm/WASMCallingConvention.cpp with 84% similarity]	patch \| blob \| history
Source/JavaScriptCore/wasm/WasmCallingConvention.h	[moved from Source/JavaScriptCore/wasm/WASMCallingConvention.h with 97% similarity]	patch \| blob \| history
Source/JavaScriptCore/wasm/WasmFormat.h	[moved from Source/JavaScriptCore/wasm/WASMFormat.h with 92% similarity]	patch \| blob \| history
Source/JavaScriptCore/wasm/WasmFunctionParser.h	[moved from Source/JavaScriptCore/wasm/WASMFunctionParser.h with 99% similarity]	patch \| blob \| history
Source/JavaScriptCore/wasm/WasmMemory.cpp	[moved from Source/JavaScriptCore/wasm/WASMMemory.cpp with 97% similarity]	patch \| blob \| history
Source/JavaScriptCore/wasm/WasmMemory.h	[moved from Source/JavaScriptCore/wasm/WASMMemory.h with 97% similarity]	patch \| blob \| history
Source/JavaScriptCore/wasm/WasmModuleParser.cpp	[moved from Source/JavaScriptCore/wasm/WASMModuleParser.cpp with 97% similarity]	patch \| blob \| history
Source/JavaScriptCore/wasm/WasmModuleParser.h	[moved from Source/JavaScriptCore/wasm/WASMModuleParser.h with 94% similarity]	patch \| blob \| history
Source/JavaScriptCore/wasm/WasmOps.h	[moved from Source/JavaScriptCore/wasm/WASMOps.h with 99% similarity]	patch \| blob \| history
Source/JavaScriptCore/wasm/WasmParser.h	[moved from Source/JavaScriptCore/wasm/WASMParser.h with 96% similarity]	patch \| blob \| history
Source/JavaScriptCore/wasm/WasmPlan.cpp	[moved from Source/JavaScriptCore/wasm/WASMPlan.cpp with 93% similarity]	patch \| blob \| history
Source/JavaScriptCore/wasm/WasmPlan.h	[moved from Source/JavaScriptCore/wasm/WASMPlan.h with 92% similarity]	patch \| blob \| history
Source/JavaScriptCore/wasm/WasmSections.h	[moved from Source/JavaScriptCore/wasm/WASMSections.h with 96% similarity]	patch \| blob \| history